Revert "[Tizen] Appendix log for ttrace + Print keycode and timestamp"
[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-Actor.cpp
index 5293137..daab6a7 100644 (file)
@@ -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 <test-actor-utils.h>
 
 #include <cfloat> // For FLT_MAX
+#include <set>    // For std::multiset
 #include <string>
 
 #include "assert.h"
@@ -50,9 +51,10 @@ void utc_dali_actor_cleanup(void)
 
 namespace
 {
-bool gTouchCallBackCalled  = false;
-bool gTouchCallBackCalled2 = false;
-bool gTouchCallBackCalled3 = false;
+bool gTouchCallBackCalled        = false;
+bool gTouchCallBackCalled2       = false;
+bool gTouchCallBackCalled3       = false;
+bool gHitTestTouchCallBackCalled = false;
 
 bool gHoverCallBackCalled = false;
 
@@ -112,6 +114,13 @@ static bool TestTouchCallback3(Actor, const TouchEvent&)
   END_TEST;
 }
 
+static bool TestHitTestTouchCallback(Actor, const TouchEvent&)
+{
+  gHitTestTouchCallBackCalled = true;
+  return false;
+  END_TEST;
+}
+
 static void ResetTouchCallbacks()
 {
   gTouchCallBackCalled  = false;
@@ -289,6 +298,99 @@ struct CulledPropertyNotificationFunctor
   PropertyNotification& mPropertyNotification;
 };
 
+// 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)
+{
+  // 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);
+}
+
+// Clipping test helper functions:
+Actor CreateActorWithContent(uint32_t width, uint32_t height)
+{
+  Texture image = CreateTexture(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
+  Actor   actor = CreateRenderableActor(image);
+
+  // Setup dimensions and position so actor is not skipped by culling.
+  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(width, height));
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+
+  return actor;
+}
+
+Actor CreateActorWithContent16x16()
+{
+  return CreateActorWithContent(16, 16);
+}
+
+void GenerateTrace(TestApplication& application, TraceCallStack& enabledDisableTrace, TraceCallStack& callTrace)
+{
+  enabledDisableTrace.Reset();
+  callTrace.Reset();
+  enabledDisableTrace.Enable(true);
+  callTrace.Enable(true);
+
+  application.SendNotification();
+  application.Render();
+
+  enabledDisableTrace.Enable(false);
+  callTrace.Enable(false);
+}
+
+void CheckColorMask(TestGlAbstraction& glAbstraction, bool maskValue)
+{
+  const TestGlAbstraction::ColorMaskParams& colorMaskParams = glAbstraction.GetColorMaskParams();
+
+  DALI_TEST_EQUALS<bool>(colorMaskParams.red, maskValue, TEST_LOCATION);
+  DALI_TEST_EQUALS<bool>(colorMaskParams.green, maskValue, TEST_LOCATION);
+  DALI_TEST_EQUALS<bool>(colorMaskParams.blue, maskValue, TEST_LOCATION);
+
+  // @todo only test alpha if the framebuffer has an alpha channel
+  //DALI_TEST_EQUALS<bool>(colorMaskParams.alpha, maskValue, TEST_LOCATION);
+}
+
 } // anonymous namespace
 
 //& purpose: Testing New API
@@ -1147,6 +1249,33 @@ int UtcDaliActorSetSize04(void)
   END_TEST;
 }
 
+int UtcDaliActorSetSize05(void)
+{
+  TestApplication application;
+
+  Actor   parent = Actor::New();
+  Vector2 vector(200.0f, 200.0f);
+  DALI_TEST_CHECK(vector != parent.GetCurrentProperty<Vector2>(Actor::Property::SIZE));
+
+  parent.SetProperty(Actor::Property::SIZE, vector);
+  Vector2 size = parent.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+  DALI_TEST_EQUALS(size, vector, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+
+  Actor child = Actor::New();
+  DALI_TEST_CHECK(vector != child.GetCurrentProperty<Vector2>(Actor::Property::SIZE));
+  child.SetProperty(Actor::Property::SIZE, vector);
+  size = parent.GetProperty(Actor::Property::SIZE).Get<Vector2>();
+  DALI_TEST_EQUALS(size, vector, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+
+  // flush the queue and render once
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_CHECK(vector == parent.GetCurrentProperty<Vector2>(Actor::Property::SIZE));
+
+  END_TEST;
+}
+
 int UtcDaliActorSetSizeIndividual(void)
 {
   TestApplication application;
@@ -1346,10 +1475,12 @@ int UtcDaliActorCalculateScreenExtents(void)
   actor.SetProperty(Actor::Property::POSITION, Vector3(2.0f, 2.0f, 16.0f));
   actor.SetProperty(Actor::Property::SIZE, Vector3{1.0f, 1.0f, 1.0f});
 
+  application.GetScene().Add(actor);
+
   application.SendNotification();
   application.Render();
 
-  auto expectedExtent = Rect<>{-0.5f, -0.5f, 1.0f, 1.0f};
+  auto expectedExtent = Rect<>{1.5f, 1.5f, 1.0f, 1.0f};
   auto actualExtent   = DevelActor::CalculateScreenExtents(actor);
   DALI_TEST_EQUALS(expectedExtent.x, actualExtent.x, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
   DALI_TEST_EQUALS(expectedExtent.y, actualExtent.y, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
@@ -1360,6 +1491,240 @@ int UtcDaliActorCalculateScreenExtents(void)
   END_TEST;
 }
 
+int UtcDaliActorCalculateScreenExtentsInCustomCameraAndLayer3D(void)
+{
+  TestApplication    application;
+  Integration::Scene scene = application.GetScene();
+
+  // Make 3D Layer
+  Layer layer = Layer::New();
+  layer.SetProperty(Layer::Property::BEHAVIOR, Layer::Behavior::LAYER_3D);
+  layer.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  layer.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  scene.Add(layer);
+
+  // Build custom camera with top-view
+  CameraActor cameraActor = scene.GetRenderTaskList().GetTask(0).GetCameraActor();
+  {
+    // Default camera position at +z and looking -z axis. (orientation is [ Axis: [0, 1, 0], Angle: 180 degrees ])
+    Vector3    cameraPos    = cameraActor.GetProperty<Vector3>(Actor::Property::POSITION);
+    Quaternion cameraOrient = cameraActor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+
+    {
+      std::ostringstream oss;
+      oss << cameraPos << "\n";
+      oss << cameraOrient << "\n";
+      tet_printf("%s\n", oss.str().c_str());
+    }
+
+    cameraActor.SetProperty(Actor::Property::POSITION, Vector3(0.0f, -cameraPos.z, 0.0f));
+    cameraActor.SetProperty(Actor::Property::ORIENTATION, Quaternion(Degree(90.0f), Vector3::XAXIS) * cameraOrient);
+
+    // Now, upside : -Z, leftside : -X, foward : +Y
+
+    cameraPos    = cameraActor.GetProperty<Vector3>(Actor::Property::POSITION);
+    cameraOrient = cameraActor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+    {
+      std::ostringstream oss;
+      oss << cameraPos << "\n";
+      oss << cameraOrient << "\n";
+      tet_printf("%s\n", oss.str().c_str());
+    }
+  }
+
+  Actor actor = Actor::New();
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actor.SetProperty(Actor::Property::POSITION, Vector3(2.0f, 0.0f, 16.0f));
+  actor.SetProperty(Actor::Property::SIZE, Vector3{1.0f, 0.0f, 3.0f});
+
+  layer.Add(actor);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector2 sceneSize = scene.GetSize();
+
+  auto expectedExtent = Rect<>{sceneSize.x * 0.5f + 1.5f, sceneSize.y * 0.5f + 14.5f, 1.0f, 3.0f};
+  auto actualExtent   = DevelActor::CalculateScreenExtents(actor);
+  {
+    std::ostringstream oss;
+    oss << expectedExtent << "\n";
+    oss << actualExtent << "\n";
+    tet_printf("%s\n", oss.str().c_str());
+  }
+
+  DALI_TEST_EQUALS(expectedExtent.x, actualExtent.x, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.y, actualExtent.y, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.width, actualExtent.width, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.height, actualExtent.height, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliActorCalculateScreenInCustomCameraAndOffscreenLayer3D(void)
+{
+  // TODO : Need to make it works well
+  TestApplication    application;
+  Integration::Scene scene     = application.GetScene();
+  Vector2            sceneSize = scene.GetSize();
+
+  // Make 3D Layer
+  Layer layer = Layer::New();
+  layer.SetProperty(Layer::Property::BEHAVIOR, Layer::Behavior::LAYER_3D);
+  layer.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  layer.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  layer.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
+  layer.SetProperty(Actor::Property::SIZE, sceneSize);
+
+  scene.Add(layer);
+
+  // Build custom camera with top-view
+  CameraActor offscreenCameraActor = CameraActor::New(Size(TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT));
+
+  offscreenCameraActor.SetPerspectiveProjection(sceneSize);
+  offscreenCameraActor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  offscreenCameraActor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  scene.Add(offscreenCameraActor);
+  {
+    // Default camera position at +z and looking -z axis. (orientation is [ Axis: [0, 1, 0], Angle: 180 degrees ])
+    Vector3    cameraPos    = offscreenCameraActor.GetProperty<Vector3>(Actor::Property::POSITION);
+    Quaternion cameraOrient = offscreenCameraActor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+
+    {
+      std::ostringstream oss;
+      oss << cameraPos << "\n";
+      oss << cameraOrient << "\n";
+      tet_printf("%s\n", oss.str().c_str());
+    }
+
+    offscreenCameraActor.SetProperty(Actor::Property::POSITION, Vector3(0.0f, -cameraPos.z, 0.0f));
+    offscreenCameraActor.SetProperty(Actor::Property::ORIENTATION, Quaternion(Degree(90.0f), Vector3::XAXIS) * cameraOrient);
+
+    // Now, upside : -Z, leftside : -X, foward : +Y
+
+    cameraPos    = offscreenCameraActor.GetProperty<Vector3>(Actor::Property::POSITION);
+    cameraOrient = offscreenCameraActor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+    {
+      std::ostringstream oss;
+      oss << cameraPos << "\n";
+      oss << cameraOrient << "\n";
+      tet_printf("%s\n", oss.str().c_str());
+    }
+  }
+  Vector3 sourcePosition{2.0f, 0.0f, 16.0f};
+  Vector3 sourceSize{1.0f, 0.0f, 3.0f};
+
+  Actor sourceActor = Actor::New();
+  sourceActor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  sourceActor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  sourceActor.SetProperty(Actor::Property::POSITION, sourcePosition);
+  sourceActor.SetProperty(Actor::Property::SIZE, sourceSize);
+
+  layer.Add(sourceActor);
+
+  // Create framebuffer
+  unsigned int width(64);
+  unsigned int height(64);
+  Texture      texture     = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
+  FrameBuffer  frameBuffer = FrameBuffer::New(width, height, FrameBuffer::Attachment::DEPTH_STENCIL);
+  frameBuffer.AttachColorTexture(texture);
+
+  Actor rootActor = Actor::New();
+  rootActor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  rootActor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  rootActor.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
+  rootActor.SetProperty(Actor::Property::SIZE, sceneSize);
+  scene.Add(rootActor);
+
+  RenderTaskList taskList = scene.GetRenderTaskList();
+  RenderTask     newTask  = taskList.CreateTask();
+  newTask.SetCameraActor(offscreenCameraActor);
+  newTask.SetSourceActor(layer);
+  newTask.SetInputEnabled(false);
+  newTask.SetClearColor(Vector4(0.f, 0.f, 0.f, 0.f));
+  newTask.SetClearEnabled(true);
+  newTask.SetExclusive(true);
+  newTask.SetFrameBuffer(frameBuffer);
+  newTask.SetScreenToFrameBufferMappingActor(rootActor);
+
+  application.SendNotification();
+  application.Render(16u);
+
+  auto expectedExtent = Rect<>{sceneSize.x * 0.5f + sourcePosition.x - sourceSize.x * 0.5f,
+                               sceneSize.y * 0.5f + sourcePosition.z - sourceSize.z * 0.5f,
+                               sourceSize.x,
+                               sourceSize.z};
+  auto actualExtent   = DevelActor::CalculateScreenExtents(sourceActor);
+  {
+    std::ostringstream oss;
+    oss << expectedExtent << "\n";
+    oss << actualExtent << "\n";
+    tet_printf("%s\n", oss.str().c_str());
+  }
+
+  auto expectedScreen = Vector2{sceneSize.x * 0.5f + sourcePosition.x, sceneSize.y * 0.5f + sourcePosition.z};
+  auto actualScreen   = sourceActor.GetProperty<Vector2>(Actor::Property::SCREEN_POSITION);
+  {
+    std::ostringstream oss;
+    oss << expectedScreen << "\n";
+    oss << actualScreen << "\n";
+    tet_printf("%s\n", oss.str().c_str());
+  }
+
+  DALI_TEST_EQUALS(expectedExtent.x, actualExtent.x, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.y, actualExtent.y, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.width, actualExtent.width, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.height, actualExtent.height, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(expectedScreen.x, actualScreen.x, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedScreen.y, actualScreen.y, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+
+  // Change rootActor's size and position
+
+  Vector3 rootPosition{100.0f, 200.0f, 0.0f};
+  Vector3 rootSize{200.0f, 100.0f, 0.0f};
+
+  rootActor.SetProperty(Actor::Property::POSITION, rootPosition);
+  rootActor.SetProperty(Actor::Property::SIZE, rootSize);
+
+  application.SendNotification();
+  application.Render(16u);
+
+  expectedExtent = Rect<>{sceneSize.x * 0.5f + rootPosition.x + (sourcePosition.x - sourceSize.x * 0.5f) * rootSize.x / sceneSize.x,
+                          sceneSize.y * 0.5f + rootPosition.y + (sourcePosition.z - sourceSize.z * 0.5f) * rootSize.y / sceneSize.y,
+                          sourceSize.x * rootSize.x / sceneSize.x,
+                          sourceSize.z * rootSize.y / sceneSize.y};
+  actualExtent   = DevelActor::CalculateScreenExtents(sourceActor);
+  {
+    std::ostringstream oss;
+    oss << expectedExtent << "\n";
+    oss << actualExtent << "\n";
+    tet_printf("%s\n", oss.str().c_str());
+  }
+
+  expectedScreen = Vector2{sceneSize.x * 0.5f + rootPosition.x + sourcePosition.x * rootSize.x / sceneSize.x, sceneSize.y * 0.5f + rootPosition.y + sourcePosition.z * rootSize.y / sceneSize.y};
+  actualScreen   = sourceActor.GetProperty<Vector2>(Actor::Property::SCREEN_POSITION);
+  {
+    std::ostringstream oss;
+    oss << expectedScreen << "\n";
+    oss << actualScreen << "\n";
+    tet_printf("%s\n", oss.str().c_str());
+  }
+
+  DALI_TEST_EQUALS(expectedExtent.x, actualExtent.x, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.y, actualExtent.y, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.width, actualExtent.width, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedExtent.height, actualExtent.height, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(expectedScreen.x, actualScreen.x, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+  DALI_TEST_EQUALS(expectedScreen.y, actualScreen.y, Math::MACHINE_EPSILON_10000, TEST_LOCATION);
+
+  END_TEST;
+}
+
 // SetPosition(float x, float y)
 int UtcDaliActorSetPosition01(void)
 {
@@ -2598,6 +2963,29 @@ int UtcDaliActorIsTouchFocusable(void)
   END_TEST;
 }
 
+int UtcDaliActorSetUserInteractionEnabled(void)
+{
+  TestApplication application;
+  Actor           actor = Actor::New();
+
+  bool enabled = !actor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED);
+
+  actor.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, enabled);
+
+  DALI_TEST_CHECK(enabled == actor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED));
+  END_TEST;
+}
+
+int UtcDaliActorIsUserInteractionEnabled(void)
+{
+  TestApplication application;
+  Actor           actor = Actor::New();
+  actor.SetProperty(DevelActor::Property::USER_INTERACTION_ENABLED, true);
+
+  DALI_TEST_CHECK(true == actor.GetProperty<bool>(DevelActor::Property::USER_INTERACTION_ENABLED));
+  END_TEST;
+}
+
 int UtcDaliActorRemoveConstraints(void)
 {
   tet_infoline(" UtcDaliActorRemoveConstraints");
@@ -3095,61 +3483,150 @@ int UtcDaliActorSetDrawModeOverlayRender(void)
   END_TEST;
 }
 
-int UtcDaliActorGetCurrentWorldMatrix(void)
+int UtcDaliActorSetDrawModeOverlayWithClipping(void)
 {
   TestApplication application;
-  tet_infoline(" UtcDaliActorGetCurrentWorldMatrix");
+  tet_infoline(" UtcDaliActorSetDrawModeOverlayWithClipping");
 
-  Actor parent = Actor::New();
-  parent.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  parent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  Vector3    parentPosition(10.0f, 20.0f, 30.0f);
-  Radian     rotationAngle(Degree(85.0f));
-  Quaternion parentRotation(rotationAngle, Vector3::ZAXIS);
-  Vector3    parentScale(1.0f, 2.0f, 3.0f);
-  parent.SetProperty(Actor::Property::POSITION, parentPosition);
-  parent.SetProperty(Actor::Property::ORIENTATION, parentRotation);
-  parent.SetProperty(Actor::Property::SCALE, parentScale);
-  application.GetScene().Add(parent);
+  TestGlAbstraction& glAbstraction       = application.GetGlAbstraction();
+  TraceCallStack&    scissorTrace        = glAbstraction.GetScissorTrace();
+  TraceCallStack&    enabledDisableTrace = glAbstraction.GetEnableDisableTrace();
 
-  Actor child = Actor::New();
-  child.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  Vector3    childPosition(0.0f, 0.0f, 100.0f);
-  Radian     childRotationAngle(Degree(23.0f));
-  Quaternion childRotation(childRotationAngle, Vector3::YAXIS);
-  Vector3    childScale(2.0f, 2.0f, 2.0f);
-  child.SetProperty(Actor::Property::POSITION, childPosition);
-  child.SetProperty(Actor::Property::ORIENTATION, childRotation);
-  child.SetProperty(Actor::Property::SCALE, childScale);
-  parent.Add(child);
+  const Vector2 surfaceSize(TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  const Vector2 imageSize(16.0f, 16.0f);
+
+  std::vector<GLuint> ids;
+  ids.push_back(8);  // first rendered actor
+  ids.push_back(9);  // second rendered actor
+  ids.push_back(10); // third rendered actor
+  ids.push_back(11); // forth rendered actor
+  application.GetGlAbstraction().SetNextTextureIds(ids);
+
+  Actor a = CreateActorWithContent16x16();
+  Actor b = CreateActorWithContent16x16();
+  Actor c = CreateActorWithContent16x16();
+  Actor d = CreateActorWithContent16x16();
 
   application.SendNotification();
-  application.Render(0);
   application.Render();
-  application.SendNotification();
 
-  Matrix parentMatrix(false);
-  parentMatrix.SetTransformComponents(parentScale, parentRotation, parentPosition);
+  //Textures are bound when first created. Clear bound textures vector
+  application.GetGlAbstraction().ClearBoundTextures();
 
-  Matrix childMatrix(false);
-  childMatrix.SetTransformComponents(childScale, childRotation, childPosition);
+  b[Actor::Property::PARENT_ORIGIN] = ParentOrigin::BOTTOM_LEFT;
+  b[Actor::Property::ANCHOR_POINT]  = AnchorPoint::BOTTOM_LEFT;
+  b[Actor::Property::DRAW_MODE]     = DrawMode::OVERLAY_2D;
+  b[Actor::Property::CLIPPING_MODE] = ClippingMode::CLIP_TO_BOUNDING_BOX;
 
-  //Child matrix should be the composition of child and parent
-  Matrix childWorldMatrix(false);
-  Matrix::Multiply(childWorldMatrix, childMatrix, parentMatrix);
+  c[Actor::Property::PARENT_ORIGIN] = ParentOrigin::BOTTOM_LEFT;
+  c[Actor::Property::ANCHOR_POINT]  = AnchorPoint::BOTTOM_LEFT;
+  c[Actor::Property::CLIPPING_MODE] = ClippingMode::CLIP_TO_BOUNDING_BOX;
+  c[Actor::Property::POSITION]      = Vector2(100.0f, -100.0f);
 
-  DALI_TEST_EQUALS(parent.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX), parentMatrix, 0.001, TEST_LOCATION);
-  DALI_TEST_EQUALS(child.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX), childWorldMatrix, 0.001, TEST_LOCATION);
-  END_TEST;
-}
+  application.GetScene().Add(a);
+  application.GetScene().Add(b);
+  application.GetScene().Add(c);
+  b.Add(d);
 
-int UtcDaliActorConstrainedToWorldMatrix(void)
-{
-  TestApplication application;
-  tet_infoline(" UtcDaliActorConstrainedToWorldMatrix");
+  GenerateTrace(application, enabledDisableTrace, scissorTrace);
 
-  Actor parent = Actor::New();
-  parent.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  const std::vector<GLuint>&             boundTextures = application.GetGlAbstraction().GetBoundTextures(GL_TEXTURE0);
+  typedef std::vector<GLuint>::size_type TextureSize;
+  DALI_TEST_EQUALS(boundTextures.size(), static_cast<TextureSize>(4), TEST_LOCATION);
+  if(boundTextures.size() == 4)
+  {
+    DALI_TEST_CHECK(boundTextures[0] == 8u);
+    DALI_TEST_CHECK(boundTextures[1] == 10u);
+    DALI_TEST_CHECK(boundTextures[2] == 9u);
+    DALI_TEST_CHECK(boundTextures[3] == 11u);
+  }
+
+  // Check scissor test was enabled.
+  std::ostringstream scissor;
+  scissor << std::hex << GL_SCISSOR_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", scissor.str()));
+
+  // Check the scissor was set, and the coordinates are correct.
+  DALI_TEST_CHECK(scissorTrace.TestMethodAndParams(0, "Scissor", "100, 100, 16, 16")); // First compare with c area
+  DALI_TEST_CHECK(scissorTrace.TestMethodAndParams(1, "Scissor", "0, 0, 16, 16"));     // Second compare with b area
+
+  application.GetGlAbstraction().ClearBoundTextures();
+
+  // Remove a Renderer of overlay actor
+  Renderer renderer = b.GetRendererAt(0);
+  b.RemoveRenderer(renderer);
+
+  GenerateTrace(application, enabledDisableTrace, scissorTrace);
+
+  DALI_TEST_EQUALS(boundTextures.size(), static_cast<TextureSize>(3), TEST_LOCATION);
+  if(boundTextures.size() == 3)
+  {
+    DALI_TEST_CHECK(boundTextures[0] == 8u);
+    DALI_TEST_CHECK(boundTextures[1] == 10u);
+    DALI_TEST_CHECK(boundTextures[2] == 11u);
+  }
+
+  DALI_TEST_CHECK(scissorTrace.TestMethodAndParams(0, "Scissor", "100, 100, 16, 16")); // First compare with c area
+  DALI_TEST_CHECK(scissorTrace.TestMethodAndParams(1, "Scissor", "0, 0, 16, 16"));     // Second compare with b area
+
+  END_TEST;
+}
+
+int UtcDaliActorGetCurrentWorldMatrix(void)
+{
+  TestApplication application;
+  tet_infoline(" UtcDaliActorGetCurrentWorldMatrix");
+
+  Actor parent = Actor::New();
+  parent.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  parent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  Vector3    parentPosition(10.0f, 20.0f, 30.0f);
+  Radian     rotationAngle(Degree(85.0f));
+  Quaternion parentRotation(rotationAngle, Vector3::ZAXIS);
+  Vector3    parentScale(1.0f, 2.0f, 3.0f);
+  parent.SetProperty(Actor::Property::POSITION, parentPosition);
+  parent.SetProperty(Actor::Property::ORIENTATION, parentRotation);
+  parent.SetProperty(Actor::Property::SCALE, parentScale);
+  application.GetScene().Add(parent);
+
+  Actor child = Actor::New();
+  child.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  Vector3    childPosition(0.0f, 0.0f, 100.0f);
+  Radian     childRotationAngle(Degree(23.0f));
+  Quaternion childRotation(childRotationAngle, Vector3::YAXIS);
+  Vector3    childScale(2.0f, 2.0f, 2.0f);
+  child.SetProperty(Actor::Property::POSITION, childPosition);
+  child.SetProperty(Actor::Property::ORIENTATION, childRotation);
+  child.SetProperty(Actor::Property::SCALE, childScale);
+  parent.Add(child);
+
+  application.SendNotification();
+  application.Render(0);
+  application.Render();
+  application.SendNotification();
+
+  Matrix parentMatrix(false);
+  parentMatrix.SetTransformComponents(parentScale, parentRotation, parentPosition);
+
+  Matrix childMatrix(false);
+  childMatrix.SetTransformComponents(childScale, childRotation, childPosition);
+
+  //Child matrix should be the composition of child and parent
+  Matrix childWorldMatrix(false);
+  Matrix::Multiply(childWorldMatrix, childMatrix, parentMatrix);
+
+  DALI_TEST_EQUALS(parent.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX), parentMatrix, 0.001, TEST_LOCATION);
+  DALI_TEST_EQUALS(child.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX), childWorldMatrix, 0.001, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliActorConstrainedToWorldMatrix(void)
+{
+  TestApplication application;
+  tet_infoline(" UtcDaliActorConstrainedToWorldMatrix");
+
+  Actor parent = Actor::New();
+  parent.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
   parent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
   Vector3    parentPosition(10.0f, 20.0f, 30.0f);
   Radian     rotationAngle(Degree(85.0f));
@@ -4152,74 +4629,98 @@ int UtcDaliActorRemoveRendererP2(void)
   END_TEST;
 }
 
-int UtcDaliActorRemoveRendererN(void)
+int UtcDaliActorRemoveRendererP3(void)
 {
   tet_infoline("Testing Actor::RemoveRenderer");
   TestApplication application;
 
-  Actor actor = Actor::New();
-
-  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+  Actor actor1 = Actor::New();
+  Actor actor2 = Actor::New();
+  Actor actor3 = Actor::New();
 
-  Geometry geometry = CreateQuadGeometry();
-  Shader   shader   = CreateShader();
-  Renderer renderer = Renderer::New(geometry, shader);
+  application.GetScene().Add(actor1);
+  application.GetScene().Add(actor2);
+  application.GetScene().Add(actor3);
 
-  actor.AddRenderer(renderer);
-  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
-  DALI_TEST_EQUALS(actor.GetRendererAt(0), renderer, TEST_LOCATION);
+  // Make each actors size bigger than zero, so we can assuem that actor is rendered
+  actor1.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
+  actor2.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
+  actor3.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
 
-  actor.RemoveRenderer(10);
-  DALI_TEST_EQUALS(actor.GetRendererAt(0), renderer, TEST_LOCATION);
-  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  // Register some dummy property to seperate actor1 and actor2 in Render::Renderer
+  actor1.RegisterProperty("dummy1", 1);
+  actor2.RegisterProperty("dummy2", 2.0f);
+  actor3.RegisterProperty("dummy3", Vector2(3.0f, 4.0f));
 
-  END_TEST;
-}
+  DALI_TEST_EQUALS(actor1.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetRendererCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetRendererCount(), 0u, TEST_LOCATION);
 
-// Clipping test helper functions:
-Actor CreateActorWithContent(uint32_t width, uint32_t height)
-{
-  Texture image = CreateTexture(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
-  Actor   actor = CreateRenderableActor(image);
+  Geometry geometry  = CreateQuadGeometry();
+  Shader   shader    = CreateShader();
+  Renderer renderer1 = Renderer::New(geometry, shader);
+  Renderer renderer2 = Renderer::New(geometry, shader);
 
-  // Setup dimensions and position so actor is not skipped by culling.
-  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
-  actor.SetProperty(Actor::Property::SIZE, Vector2(width, height));
-  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  actor1.AddRenderer(renderer1);
+  actor1.AddRenderer(renderer2);
+  actor2.AddRenderer(renderer1);
+  actor2.AddRenderer(renderer2);
+  actor3.AddRenderer(renderer1);
+  actor3.AddRenderer(renderer2);
+  application.SendNotification();
+  application.Render();
 
-  return actor;
-}
+  DALI_TEST_EQUALS(actor1.GetRendererCount(), 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor1.GetRendererAt(0), renderer1, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor1.GetRendererAt(1), renderer2, TEST_LOCATION);
 
-Actor CreateActorWithContent16x16()
-{
-  return CreateActorWithContent(16, 16);
-}
+  DALI_TEST_EQUALS(actor2.GetRendererCount(), 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetRendererAt(0), renderer1, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetRendererAt(1), renderer2, TEST_LOCATION);
 
-void GenerateTrace(TestApplication& application, TraceCallStack& enabledDisableTrace, TraceCallStack& stencilTrace)
-{
-  enabledDisableTrace.Reset();
-  stencilTrace.Reset();
-  enabledDisableTrace.Enable(true);
-  stencilTrace.Enable(true);
+  DALI_TEST_EQUALS(actor3.GetRendererCount(), 2u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetRendererAt(0), renderer1, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetRendererAt(1), renderer2, TEST_LOCATION);
 
+  actor1.RemoveRenderer(0);
+  actor2.RemoveRenderer(1);
+  actor3.RemoveRenderer(0);
   application.SendNotification();
   application.Render();
 
-  enabledDisableTrace.Enable(false);
-  stencilTrace.Enable(false);
+  DALI_TEST_EQUALS(actor1.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor1.GetRendererAt(0), renderer2, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor2.GetRendererAt(0), renderer1, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor3.GetRendererAt(0), renderer2, TEST_LOCATION);
+
+  // Shut down whilst holding onto the renderer handle.
+  END_TEST;
 }
 
-void CheckColorMask(TestGlAbstraction& glAbstraction, bool maskValue)
+int UtcDaliActorRemoveRendererN(void)
 {
-  const TestGlAbstraction::ColorMaskParams& colorMaskParams = glAbstraction.GetColorMaskParams();
+  tet_infoline("Testing Actor::RemoveRenderer");
+  TestApplication application;
 
-  DALI_TEST_EQUALS<bool>(colorMaskParams.red, maskValue, TEST_LOCATION);
-  DALI_TEST_EQUALS<bool>(colorMaskParams.green, maskValue, TEST_LOCATION);
-  DALI_TEST_EQUALS<bool>(colorMaskParams.blue, maskValue, TEST_LOCATION);
+  Actor actor = Actor::New();
 
-  // @todo only test alpha if the framebuffer has an alpha channel
-  //DALI_TEST_EQUALS<bool>(colorMaskParams.alpha, maskValue, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 0u, TEST_LOCATION);
+
+  Geometry geometry = CreateQuadGeometry();
+  Shader   shader   = CreateShader();
+  Renderer renderer = Renderer::New(geometry, shader);
+
+  actor.AddRenderer(renderer);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetRendererAt(0), renderer, TEST_LOCATION);
+
+  actor.RemoveRenderer(10);
+  DALI_TEST_EQUALS(actor.GetRendererAt(0), renderer, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 1u, TEST_LOCATION);
+
+  END_TEST;
 }
 
 int UtcDaliActorPropertyClippingP(void)
@@ -4945,8 +5446,6 @@ int UtcDaliActorPropertyClippingActorWithRendererOverride(void)
 
   // Check stencil functions are not called.
   DALI_TEST_CHECK(!stencilTrace.FindMethod("StencilFunc"));
-  // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
-  //  DALI_TEST_CHECK(!stencilTrace.FindMethod("StencilMask"));
   DALI_TEST_CHECK(!stencilTrace.FindMethod("StencilOp"));
 
   // Check that scissor clipping is overriden by the renderer properties.
@@ -7014,6 +7513,121 @@ int UtcDaliActorGetScreenPositionPositionUsesAnchorPointFalse(void)
   END_TEST;
 }
 
+int UtcDaliActorGetScreenPositionResizeScene(void)
+{
+  tet_infoline("UtcDaliActorGetScreenPositionResizeScene Check screen position after resizing the scene size");
+
+  TestApplication    application;
+  Integration::Scene scene = application.GetScene();
+
+  Actor actorA = Actor::New();
+  actorA.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  actorA.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actorA.SetProperty(Actor::Property::SIZE, Vector2(10.0f, 10.0f));
+
+  scene.Add(actorA);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector2 sceneSize           = scene.GetSize();
+  Vector2 actorScreenPosition = actorA.GetProperty(Actor::Property::SCREEN_POSITION).Get<Vector2>();
+
+  DALI_TEST_EQUALS(actorScreenPosition, sceneSize / 2, TEST_LOCATION);
+
+  // Resize the scene
+  Vector2 newSize(1000.0f, 2000.0f);
+  DALI_TEST_CHECK(scene.GetSize() != newSize);
+
+  scene.SurfaceResized(newSize.width, newSize.height);
+
+  actorScreenPosition = actorA.GetProperty(Actor::Property::SCREEN_POSITION).Get<Vector2>();
+
+  // The screen position should not be updated yet
+  DALI_TEST_EQUALS(actorScreenPosition, sceneSize / 2, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render();
+
+  actorScreenPosition = actorA.GetProperty(Actor::Property::SCREEN_POSITION).Get<Vector2>();
+
+  // The screen position should be updated
+  sceneSize = scene.GetSize();
+  DALI_TEST_EQUALS(actorScreenPosition, sceneSize / 2, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliActorGetScreenPositionInCustomCameraAndLayer3D(void)
+{
+  tet_infoline("UtcDaliActorGetScreenPositionInCustomCameraAndLayer3D Check screen position under LAYER_3D and custom camera");
+
+  TestApplication    application;
+  Integration::Scene scene = application.GetScene();
+
+  // Make 3D Layer
+  Layer layer = scene.GetRootLayer();
+  layer.SetProperty(Layer::Property::BEHAVIOR, Layer::Behavior::LAYER_3D);
+
+  // Build custom camera with top-view
+  CameraActor cameraActor = scene.GetRenderTaskList().GetTask(0).GetCameraActor();
+  {
+    // Default camera position at +z and looking -z axis. (orientation is [ Axis: [0, 1, 0], Angle: 180 degrees ])
+    Vector3    cameraPos    = cameraActor.GetProperty<Vector3>(Actor::Property::POSITION);
+    Quaternion cameraOrient = cameraActor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+
+    {
+      std::ostringstream oss;
+      oss << cameraPos << "\n";
+      oss << cameraOrient << "\n";
+      tet_printf("%s\n", oss.str().c_str());
+    }
+
+    cameraActor.SetProperty(Actor::Property::POSITION, Vector3(0.0f, -cameraPos.z, 0.0f));
+    cameraActor.SetProperty(Actor::Property::ORIENTATION, Quaternion(Degree(90.0f), Vector3::XAXIS) * cameraOrient);
+
+    // Now, upside : -Z, leftside : -X, foward : +Y
+
+    cameraPos    = cameraActor.GetProperty<Vector3>(Actor::Property::POSITION);
+    cameraOrient = cameraActor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+    {
+      std::ostringstream oss;
+      oss << cameraPos << "\n";
+      oss << cameraOrient << "\n";
+      tet_printf("%s\n", oss.str().c_str());
+    }
+  }
+
+  Actor actorA = Actor::New();
+  actorA.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  actorA.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actorA.SetProperty(Actor::Property::SIZE, Vector3(10.0f, 10.0f, 10.0f));
+  actorA.SetProperty(Actor::Property::POSITION, Vector3(20.0f, 0.0f, 10.0f));
+
+  Actor actorB = Actor::New();
+  actorB.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  actorB.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  actorB.SetProperty(Actor::Property::SIZE, Vector3(10.0f, 10.0f, 10.0f));
+  actorB.SetProperty(Actor::Property::POSITION, Vector3(-20.0f, 0.0f, -10.0f));
+
+  scene.Add(actorA);
+  scene.Add(actorB);
+
+  application.SendNotification();
+  application.Render();
+
+  Vector2 sceneSize           = scene.GetSize();
+  Vector2 actorScreenPosition = actorA.GetProperty(Actor::Property::SCREEN_POSITION).Get<Vector2>();
+
+  DALI_TEST_EQUALS(actorScreenPosition, sceneSize / 2 + Vector2(20.0f, 10.0f), TEST_LOCATION);
+
+  actorScreenPosition = actorB.GetProperty(Actor::Property::SCREEN_POSITION).Get<Vector2>();
+
+  DALI_TEST_EQUALS(actorScreenPosition, sceneSize / 2 - Vector2(20.0f, 10.0f), TEST_LOCATION);
+
+  END_TEST;
+}
+
 int utcDaliActorPositionUsesAnchorPoint(void)
 {
   TestApplication application;
@@ -8123,32 +8737,109 @@ int utcDaliActorGetSizeAfterAnimation(void)
   END_TEST;
 }
 
-int utcDaliActorRelayoutAndAnimation(void)
+int utcDaliActorGetSizeAfterAnimation2(void)
 {
   TestApplication application;
-  tet_infoline("Check the actor size when relayoutting and playing animation");
+  tet_infoline("Check the actor size before / after an animation is finished if before size is equal to animation target size");
 
-  Vector3 parentSize(300.0f, 300.0f, 0.0f);
   Vector3 actorSize(100.0f, 100.0f, 0.0f);
 
-  {
-    Actor parentA = Actor::New();
-    parentA.SetProperty(Actor::Property::SIZE, parentSize);
-    parentA.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
-    application.GetScene().Add(parentA);
+  Actor actor = Actor::New();
+  actor.SetProperty(Actor::Property::SIZE, actorSize);
+  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor);
 
-    Actor parentB = Actor::New();
-    parentB.SetProperty(Actor::Property::SIZE, parentSize);
-    parentB.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
-    application.GetScene().Add(parentB);
+  // Size should be updated without rendering.
+  Vector3 size = actor.GetProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(size, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
-    Actor actor = Actor::New();
-    actor.SetProperty(Actor::Property::SIZE, actorSize);
-    actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
-    parentA.Add(actor);
+  application.SendNotification();
+  application.Render();
 
-    Vector3 size = actor.GetProperty(Actor::Property::SIZE).Get<Vector3>();
-    DALI_TEST_EQUALS(size, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+  // Size and current size should be updated.
+  size = actor.GetProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(size, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+  DALI_TEST_EQUALS(actorSize.width, actor.GetProperty<float>(Actor::Property::SIZE_WIDTH), TEST_LOCATION);
+  DALI_TEST_EQUALS(actorSize.height, actor.GetProperty<float>(Actor::Property::SIZE_HEIGHT), TEST_LOCATION);
+  DALI_TEST_EQUALS(actorSize.depth, actor.GetProperty<float>(Actor::Property::SIZE_DEPTH), TEST_LOCATION);
+
+  Vector3 currentSize = actor.GetCurrentProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(currentSize, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+  DALI_TEST_EQUALS(actorSize.width, actor.GetCurrentProperty<float>(Actor::Property::SIZE_WIDTH), TEST_LOCATION);
+  DALI_TEST_EQUALS(actorSize.height, actor.GetCurrentProperty<float>(Actor::Property::SIZE_HEIGHT), TEST_LOCATION);
+  DALI_TEST_EQUALS(actorSize.depth, actor.GetCurrentProperty<float>(Actor::Property::SIZE_DEPTH), TEST_LOCATION);
+
+  // Set size again
+  actorSize = Vector3(200.0f, 200.0f, 0.0f);
+  actor.SetProperty(Actor::Property::SIZE, actorSize);
+
+  size = actor.GetProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(size, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+
+  Vector3 targetValue(actorSize);
+
+  Animation animation = Animation::New(1.0f);
+  animation.AnimateTo(Property(actor, Actor::Property::SIZE), targetValue);
+  animation.Play();
+
+  // Size should be updated without rendering.
+  size = actor.GetProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(size, targetValue, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(100); // During the animation
+
+  size = actor.GetProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(size, targetValue, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+  DALI_TEST_EQUALS(targetValue.width, actor.GetProperty<float>(Actor::Property::SIZE_WIDTH), TEST_LOCATION);
+  DALI_TEST_EQUALS(targetValue.height, actor.GetProperty<float>(Actor::Property::SIZE_HEIGHT), TEST_LOCATION);
+  DALI_TEST_EQUALS(targetValue.depth, actor.GetProperty<float>(Actor::Property::SIZE_DEPTH), TEST_LOCATION);
+
+  // We should get target value because targetValue is equal to current actor size.
+  currentSize = actor.GetCurrentProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(currentSize, targetValue, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+  DALI_TEST_EQUALS(targetValue.width, actor.GetCurrentProperty<float>(Actor::Property::SIZE_WIDTH), TEST_LOCATION);
+  DALI_TEST_EQUALS(targetValue.height, actor.GetCurrentProperty<float>(Actor::Property::SIZE_HEIGHT), TEST_LOCATION);
+  DALI_TEST_EQUALS(targetValue.depth, actor.GetCurrentProperty<float>(Actor::Property::SIZE_DEPTH), TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(1000); // After animation finished
+
+  size = actor.GetProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(size, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+
+  currentSize = actor.GetCurrentProperty(Actor::Property::SIZE).Get<Vector3>();
+  DALI_TEST_EQUALS(currentSize, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliActorRelayoutAndAnimation(void)
+{
+  TestApplication application;
+  tet_infoline("Check the actor size when relayoutting and playing animation");
+
+  Vector3 parentSize(300.0f, 300.0f, 0.0f);
+  Vector3 actorSize(100.0f, 100.0f, 0.0f);
+
+  {
+    Actor parentA = Actor::New();
+    parentA.SetProperty(Actor::Property::SIZE, parentSize);
+    parentA.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(parentA);
+
+    Actor parentB = Actor::New();
+    parentB.SetProperty(Actor::Property::SIZE, parentSize);
+    parentB.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+    application.GetScene().Add(parentB);
+
+    Actor actor = Actor::New();
+    actor.SetProperty(Actor::Property::SIZE, actorSize);
+    actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+    parentA.Add(actor);
+
+    Vector3 size = actor.GetProperty(Actor::Property::SIZE).Get<Vector3>();
+    DALI_TEST_EQUALS(size, actorSize, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
     Vector3 targetValue(200.0f, 200.0f, 0.0f);
 
@@ -8296,8 +8987,8 @@ int utcDaliActorPartialUpdate(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   // Aligned by 16
-  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8313,8 +9004,8 @@ int utcDaliActorPartialUpdate(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   // Aligned by 16
-  clippingRect = Rect<int>(16, 752, 48, 48); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  clippingRect = Rect<int>(16, 752, 48, 48); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8330,8 +9021,8 @@ int utcDaliActorPartialUpdate(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   // Aligned by 16
-  clippingRect = Rect<int>(16, 736, 64, 64); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  clippingRect = Rect<int>(16, 736, 64, 64); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8341,18 +9032,15 @@ int utcDaliActorPartialUpdate(void)
   application.GetScene().Remove(actor);
   application.SendNotification();
 
-  // Actor removed, last 3 dirty rects are reported. Adaptor would merge them together.
+  // Actor removed, last a dirty rect is reported.
   damagedRects.clear();
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
-  DALI_TEST_EQUALS(damagedRects.size(), 3, TEST_LOCATION);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   clippingRect = damagedRects[0];
-  clippingRect.Merge(damagedRects[1]);
-  clippingRect.Merge(damagedRects[2]);
 
-  DALI_TEST_EQUALS(clippingRect.IsEmpty(), false, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.IsValid(), true, TEST_LOCATION);
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, Rect<int>(16, 736, 64, 64), TEST_LOCATION);
+  DALI_TEST_EQUALS<Rect<int>>(clippingRect, Rect<int>(32, 736, 48, 48), TEST_LOCATION);
 
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
@@ -8403,8 +9091,8 @@ int utcDaliActorPartialUpdateSetColor(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   // Aligned by 16
-  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8413,9 +9101,11 @@ int utcDaliActorPartialUpdateSetColor(void)
 
   damagedRects.clear();
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
   damagedRects.clear();
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
   // 2. Set new color
   actor.SetProperty(Actor::Property::COLOR, Vector3(1.0f, 0.0f, 0.0f));
@@ -8426,8 +9116,8 @@ int utcDaliActorPartialUpdateSetColor(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   // Aligned by 16
-  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8501,8 +9191,8 @@ int utcDaliActorPartialUpdateSetProperty(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   // Aligned by 16
-  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8517,7 +9207,7 @@ int utcDaliActorPartialUpdateSetProperty(void)
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8538,7 +9228,7 @@ int utcDaliActorPartialUpdateSetProperty(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   clippingRect = Rect<int>(16, 752, 32, 48); // new clipping rect size increased due to change in actor size
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8583,8 +9273,7 @@ int utcDaliActorPartialUpdateTwoActors(void)
   application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
 
   DALI_TEST_EQUALS(damagedRects.size(), 2, TEST_LOCATION);
-  DALI_TEST_EQUALS<Rect<int>>(Rect<int>(64, 672, 64, 64), damagedRects[0], TEST_LOCATION);
-  DALI_TEST_EQUALS<Rect<int>>(Rect<int>(96, 592, 112, 112), damagedRects[1], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {Rect<int>(64, 672, 64, 64), Rect<int>(96, 592, 112, 112)}, true, TEST_LOCATION);
 
   // in screen coordinates, adaptor would calculate it using previous frames information
   Rect<int> clippingRect = Rect<int>(64, 592, 144, 192);
@@ -8610,7 +9299,7 @@ int utcDaliActorPartialUpdateTwoActors(void)
   application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
 
   DALI_TEST_CHECK(damagedRects.size() > 0);
-  DALI_TEST_EQUALS<Rect<int>>(Rect<int>(64, 672, 64, 64), damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {Rect<int>(64, 672, 64, 64)}, false, TEST_LOCATION);
 
   // in screen coordinates, adaptor would calculate it using previous frames information
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
@@ -8623,7 +9312,7 @@ int utcDaliActorPartialUpdateTwoActors(void)
   END_TEST;
 }
 
-int utcDaliActorPartialUpdateActorsWithSizeHint(void)
+int utcDaliActorPartialUpdateActorsWithSizeHint01(void)
 {
   TestApplication application(
     TestApplication::DEFAULT_SURFACE_WIDTH,
@@ -8633,14 +9322,14 @@ int utcDaliActorPartialUpdateActorsWithSizeHint(void)
     true,
     true);
 
-  tet_infoline("Check the damaged rect with partial update and actor size hint");
+  tet_infoline("Check the damaged rect with partial update and update area hint");
 
   const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
 
   Actor actor = CreateRenderableActor();
   actor.SetProperty(Actor::Property::POSITION, Vector3(64.0f, 64.0f, 0.0f));
   actor.SetProperty(Actor::Property::SIZE, Vector3(32.0f, 32.0f, 0.0f));
-  actor.SetProperty(DevelActor::Property::UPDATE_SIZE_HINT, Vector3(64.0f, 64.0f, 0.0f));
+  actor.SetProperty(Actor::Property::UPDATE_AREA_HINT, Vector4(0.0f, 0.0f, 64.0f, 64.0f));
   actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
   application.GetScene().Add(actor);
 
@@ -8651,7 +9340,7 @@ int utcDaliActorPartialUpdateActorsWithSizeHint(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   Rect<int> clippingRect = Rect<int>(32, 704, 80, 80);
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
 
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
@@ -8660,130 +9349,86 @@ int utcDaliActorPartialUpdateActorsWithSizeHint(void)
   DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
 
-  END_TEST;
-}
-
-int utcDaliActorPartialUpdateAnimation(void)
-{
-  TestApplication application(
-    TestApplication::DEFAULT_SURFACE_WIDTH,
-    TestApplication::DEFAULT_SURFACE_HEIGHT,
-    TestApplication::DEFAULT_HORIZONTAL_DPI,
-    TestApplication::DEFAULT_VERTICAL_DPI,
-    true,
-    true);
-
-  tet_infoline("Check the damaged area with partial update and animation");
-
-  TraceCallStack& drawTrace = application.GetGlAbstraction().GetDrawTrace();
-  drawTrace.Enable(true);
-  drawTrace.Reset();
-
-  Actor actor1 = CreateRenderableActor();
-  actor1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  actor1.SetProperty(Actor::Property::SIZE, Vector3(80.0f, 80.0f, 0.0f));
-  application.GetScene().Add(actor1);
-
-  Actor actor2 = CreateRenderableActor();
-  actor2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  actor2.SetProperty(Actor::Property::SIZE, Vector3(16.0f, 16.0f, 0.0f));
-  application.GetScene().Add(actor2);
-
-  std::vector<Rect<int>> damagedRects;
-  Rect<int>              clippingRect;
-  Rect<int>              expectedRect1, expectedRect2;
+  // Reset
+  actor.Unparent();
 
+  damagedRects.clear();
   application.SendNotification();
-  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
-
-  DALI_TEST_EQUALS(damagedRects.size(), 2, TEST_LOCATION);
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
 
-  // Aligned by 16
-  expectedRect1 = Rect<int>(0, 720, 96, 96); // in screen coordinates, includes 3 last frames updates
-  expectedRect2 = Rect<int>(0, 784, 32, 32); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(expectedRect1, damagedRects[0], TEST_LOCATION);
-  DALI_TEST_EQUALS<Rect<int>>(expectedRect2, damagedRects[1], TEST_LOCATION);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
 
-  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
   damagedRects.clear();
-  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
-  // Make an animation
-  Animation animation = Animation::New(1.0f);
-  animation.AnimateTo(Property(actor2, Actor::Property::POSITION_X), 160.0f, TimePeriod(0.5f, 0.5f));
-  animation.Play();
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Chnage UPDATE_AREA_HINT
+  actor.SetProperty(Actor::Property::UPDATE_AREA_HINT, Vector4(16.0f, 16.0f, 32.0f, 32.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
 
-  damagedRects.clear();
-  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
-  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
-  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
-  drawTrace.Reset();
-  damagedRects.clear();
+  clippingRect = Rect<int>(64, 704, 48, 48);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
 
-  // In animation deley time
-  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
-  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
-  // Skip rendering
-  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawElements"), 0, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  // Reset
+  actor.Unparent();
 
-  drawTrace.Reset();
   damagedRects.clear();
+  application.SendNotification();
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
+
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
 
-  // Also in animation deley time
-  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
-  application.PreRenderWithPartialUpdate(100, nullptr, damagedRects);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
-  // Skip rendering
-  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawElements"), 0, TEST_LOCATION);
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
-  // Unparent 2 actors and make a new actor
-  actor1.Unparent();
-  actor2.Unparent();
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
 
-  Actor actor3 = CreateRenderableActor();
-  actor3.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  actor3.SetProperty(Actor::Property::SIZE, Vector3(16.0f, 16.0f, 0.0f));
-  application.GetScene().Add(actor3);
+  // Chnage UPDATE_AREA_HINT
+  actor.SetProperty(Actor::Property::UPDATE_AREA_HINT, Vector4(-32.0f, -16.0f, 64.0f, 64.0f));
+  application.GetScene().Add(actor);
 
   application.SendNotification();
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
 
-  // Started animation
-  damagedRects.clear();
-  application.PreRenderWithPartialUpdate(500, nullptr, damagedRects);
-  DALI_TEST_EQUALS(damagedRects.size(), 5, TEST_LOCATION);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
-  // The first dirty rect is actor3's.
-  // We don't know the exact dirty rect of actor2
-  DALI_TEST_EQUALS<Rect<int>>(expectedRect2, damagedRects[0], TEST_LOCATION);
-  DALI_TEST_EQUALS<Rect<int>>(expectedRect1, damagedRects[1], TEST_LOCATION);
+  clippingRect = Rect<int>(0, 720, 80, 80);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
 
-  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
-  // Finished animation, but the actor was already unparented
-  damagedRects.clear();
-  application.PreRenderWithPartialUpdate(500, nullptr, damagedRects);
-
-  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
-  DALI_TEST_EQUALS<Rect<int>>(expectedRect2, damagedRects[0], TEST_LOCATION);
-
-  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
-  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
 
   END_TEST;
 }
 
-int utcDaliActorPartialUpdateChangeVisibility(void)
+int utcDaliActorPartialUpdateActorsWithSizeHint02(void)
 {
   TestApplication application(
     TestApplication::DEFAULT_SURFACE_WIDTH,
@@ -8793,30 +9438,27 @@ int utcDaliActorPartialUpdateChangeVisibility(void)
     true,
     true);
 
-  tet_infoline("Check the damaged rect with partial update and visibility change");
+  tet_infoline("Check the damaged rect with partial update and update area hint");
 
   const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
 
   Actor actor = CreateRenderableActor();
-  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  actor.SetProperty(Actor::Property::POSITION, Vector3(16.0f, 16.0f, 0.0f));
-  actor.SetProperty(Actor::Property::SIZE, Vector3(16.0f, 16.0f, 0.0f));
+  actor.SetProperty(Actor::Property::POSITION, Vector3(64.0f, 64.0f, 0.0f));
+  actor.SetProperty(Actor::Property::SIZE, Vector3(32.0f, 32.0f, 0.0f));
   actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
   application.GetScene().Add(actor);
 
   application.SendNotification();
-
   std::vector<Rect<int>> damagedRects;
-  Rect<int>              clippingRect;
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
 
-  // 1. Actor added, damaged rect is added size of actor
-  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
-  // Aligned by 16
-  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  Rect<int> clippingRect = Rect<int>(48, 720, 48, 48);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
@@ -8826,38 +9468,48 @@ int utcDaliActorPartialUpdateChangeVisibility(void)
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
-  damagedRects.clear();
-  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
-  application.RenderWithPartialUpdate(damagedRects, clippingRect);
-
   // Ensure the damaged rect is empty
   DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
 
-  // 2. Make the Actor invisible
-  actor.SetProperty(Actor::Property::VISIBLE, false);
+  // Change UPDATE_AREA_HINT
+  actor.SetProperty(Actor::Property::UPDATE_AREA_HINT, Vector4(0.0f, 0.0f, 64.0f, 64.0f));
+
   application.SendNotification();
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
 
-  damagedRects.clear();
-  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
-  DALI_TEST_CHECK(damagedRects.size() > 0);
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+
+  clippingRect = Rect<int>(32, 704, 80, 80);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
 
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
 
-  // 3. Make the Actor visible again
-  actor.SetProperty(Actor::Property::VISIBLE, true);
-  application.SendNotification();
-
   damagedRects.clear();
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
-  DALI_TEST_CHECK(damagedRects.size() > 0);
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Chnage UPDATE_AREA_HINT
+  actor.SetProperty(Actor::Property::UPDATE_AREA_HINT, Vector4(16.0f, 16.0f, 64.0f, 64.0f));
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
+
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+
+  clippingRect = Rect<int>(32, 688, 96, 96);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
 
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
@@ -8866,7 +9518,7 @@ int utcDaliActorPartialUpdateChangeVisibility(void)
   END_TEST;
 }
 
-int utcDaliActorPartialUpdateOnOffScene(void)
+int utcDaliActorPartialUpdateActorsWithSizeHint03(void)
 {
   TestApplication application(
     TestApplication::DEFAULT_SURFACE_WIDTH,
@@ -8876,29 +9528,289 @@ int utcDaliActorPartialUpdateOnOffScene(void)
     true,
     true);
 
-  tet_infoline("Check the damaged rect with partial update and on/off scene");
+  tet_infoline("Check the damaged rect with partial update and update area hint");
 
   const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
 
   Actor actor = CreateRenderableActor();
-  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  actor.SetProperty(Actor::Property::POSITION, Vector3(16.0f, 16.0f, 0.0f));
-  actor.SetProperty(Actor::Property::SIZE, Vector3(16.0f, 16.0f, 0.0f));
+  actor.SetProperty(Actor::Property::POSITION, Vector3(64.0f, 64.0f, 0.0f));
+  actor.SetProperty(Actor::Property::SIZE, Vector3(32.0f, 32.0f, 0.0f));
+  actor.SetProperty(Actor::Property::UPDATE_AREA_HINT, Vector4(0.0f, 0.0f, 64.0f, 64.0f));
   actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
   application.GetScene().Add(actor);
 
   application.SendNotification();
-
   std::vector<Rect<int>> damagedRects;
-  Rect<int>              clippingRect;
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
 
-  // 1. Actor added, damaged rect is added size of actor
-  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
-  // Aligned by 16
-  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  Rect<int> clippingRect = Rect<int>(32, 704, 80, 80);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Set UPDATE_AREA_HINT twice before rendering
+  actor.SetProperty(Actor::Property::UPDATE_AREA_HINT, Vector4(0.0f, 0.0f, 32.0f, 32.0f));
+  application.SendNotification();
+
+  actor.SetProperty(Actor::Property::UPDATE_AREA_HINT, Vector4(32.0f, -32.0f, 32.0f, 32.0f));
+  application.SendNotification();
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::DEFAULT_RENDER_INTERVAL, nullptr, damagedRects);
+
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+
+  clippingRect = Rect<int>(32, 704, 96, 96);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliActorPartialUpdateAnimation(void)
+{
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
+
+  tet_infoline("Check the damaged area with partial update and animation");
+
+  TraceCallStack& drawTrace = application.GetGlAbstraction().GetDrawTrace();
+  drawTrace.Enable(true);
+  drawTrace.Reset();
+
+  Actor actor1 = CreateRenderableActor();
+  actor1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  actor1.SetProperty(Actor::Property::SIZE, Vector3(80.0f, 80.0f, 0.0f));
+  application.GetScene().Add(actor1);
+
+  Actor actor2 = CreateRenderableActor();
+  actor2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  actor2.SetProperty(Actor::Property::SIZE, Vector3(16.0f, 16.0f, 0.0f));
+  application.GetScene().Add(actor2);
+
+  std::vector<Rect<int>> damagedRects;
+  Rect<int>              clippingRect;
+  Rect<int>              expectedRect1, expectedRect2;
+
+  application.SendNotification();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  DALI_TEST_EQUALS(damagedRects.size(), 2, TEST_LOCATION);
+
+  // Aligned by 16
+  expectedRect1 = Rect<int>(0, 720, 96, 96); // in screen coordinates, includes 1 last frames updates
+  expectedRect2 = Rect<int>(0, 784, 32, 32); // in screen coordinates, includes 1 last frames updates
+  DirtyRectChecker(damagedRects, {expectedRect1, expectedRect2}, true, TEST_LOCATION);
+
+  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Make an animation
+  Animation animation = Animation::New(1.0f);
+  animation.AnimateTo(Property(actor2, Actor::Property::POSITION_X), 160.0f, TimePeriod(0.5f, 0.5f));
+  animation.Play();
+
+  application.SendNotification();
+
+  damagedRects.clear();
+  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  drawTrace.Reset();
+  damagedRects.clear();
+
+  // In animation deley time
+  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Skip rendering
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawElements"), 0, TEST_LOCATION);
+
+  drawTrace.Reset();
+  damagedRects.clear();
+
+  // Also in animation deley time
+  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
+  application.PreRenderWithPartialUpdate(100, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Skip rendering
+  DALI_TEST_EQUALS(drawTrace.CountMethod("DrawElements"), 0, TEST_LOCATION);
+
+  // Unparent 2 actors and make a new actor
+  actor1.Unparent();
+  actor2.Unparent();
+
+  Actor actor3 = CreateRenderableActor();
+  actor3.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  actor3.SetProperty(Actor::Property::SIZE, Vector3(16.0f, 16.0f, 0.0f));
+  application.GetScene().Add(actor3);
+
+  application.SendNotification();
+
+  // Started animation
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(500, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 3, TEST_LOCATION);
+
+  // One of dirty rect is actor3's.
+  // We don't know the exact dirty rect of actor1 and actor2.
+  DirtyRectChecker(damagedRects, {expectedRect1, expectedRect2, expectedRect2}, true, TEST_LOCATION);
+
+  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Finished animation, but the actor was already unparented
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(500, nullptr, damagedRects);
+
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  END_TEST;
+}
+
+int utcDaliActorPartialUpdateChangeVisibility(void)
+{
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
+
+  tet_infoline("Check the damaged rect with partial update and visibility change");
+
+  const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
+
+  Actor actor = CreateRenderableActor();
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  actor.SetProperty(Actor::Property::POSITION, Vector3(16.0f, 16.0f, 0.0f));
+  actor.SetProperty(Actor::Property::SIZE, Vector3(16.0f, 16.0f, 0.0f));
+  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+
+  std::vector<Rect<int>> damagedRects;
+  Rect<int>              clippingRect;
+
+  // 1. Actor added, damaged rect is added size of actor
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+
+  // Aligned by 16
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // 2. Make the Actor invisible
+  actor.SetProperty(Actor::Property::VISIBLE, false);
+  application.SendNotification();
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_CHECK(damagedRects.size() > 0);
+  DirtyRectChecker(damagedRects, {clippingRect}, false, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  // 3. Make the Actor visible again
+  actor.SetProperty(Actor::Property::VISIBLE, true);
+  application.SendNotification();
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_CHECK(damagedRects.size() > 0);
+  DirtyRectChecker(damagedRects, {clippingRect}, false, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliActorPartialUpdateOnOffScene(void)
+{
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
+
+  tet_infoline("Check the damaged rect with partial update and on/off scene");
+
+  const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
+
+  Actor actor = CreateRenderableActor();
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+  actor.SetProperty(Actor::Property::POSITION, Vector3(16.0f, 16.0f, 0.0f));
+  actor.SetProperty(Actor::Property::SIZE, Vector3(16.0f, 16.0f, 0.0f));
+  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+
+  std::vector<Rect<int>> damagedRects;
+  Rect<int>              clippingRect;
+
+  // 1. Actor added, damaged rect is added size of actor
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+
+  // Aligned by 16
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
   DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
@@ -8923,7 +9835,7 @@ int utcDaliActorPartialUpdateOnOffScene(void)
   damagedRects.clear();
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
   DALI_TEST_CHECK(damagedRects.size() > 0);
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, false, TEST_LOCATION);
 
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
@@ -8938,7 +9850,7 @@ int utcDaliActorPartialUpdateOnOffScene(void)
   damagedRects.clear();
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
   DALI_TEST_CHECK(damagedRects.size() > 0);
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, false, TEST_LOCATION);
 
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
@@ -8980,8 +9892,8 @@ int utcDaliActorPartialUpdateSkipRendering(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   // Aligned by 16
-  expectedRect1 = Rect<int>(0, 720, 96, 96); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(expectedRect1, damagedRects[0], TEST_LOCATION);
+  expectedRect1 = Rect<int>(0, 720, 96, 96); // in screen coordinates
+  DirtyRectChecker(damagedRects, {expectedRect1}, true, TEST_LOCATION);
 
   clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
@@ -9001,7 +9913,7 @@ int utcDaliActorPartialUpdateSkipRendering(void)
   damagedRects.clear();
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
 
-  DALI_TEST_EQUALS<Rect<int>>(expectedRect1, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {expectedRect1}, true, TEST_LOCATION);
 
   clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
@@ -9028,7 +9940,7 @@ int utcDaliActorPartialUpdateSkipRendering(void)
   drawTrace.Reset();
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
 
-  DALI_TEST_EQUALS<Rect<int>>(expectedRect1, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {expectedRect1}, true, TEST_LOCATION);
 
   clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
@@ -9081,7 +9993,7 @@ int utcDaliActorPartialUpdate3DNode(void)
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
 
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
-  DALI_TEST_EQUALS<Rect<int>>(TestApplication::DEFAULT_SURFACE_RECT, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {TestApplication::DEFAULT_SURFACE_RECT}, true, TEST_LOCATION);
 
   clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
   drawTrace.Reset();
@@ -9111,7 +10023,7 @@ int utcDaliActorPartialUpdate3DNode(void)
   application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
 
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
-  DALI_TEST_EQUALS<Rect<int>>(TestApplication::DEFAULT_SURFACE_RECT, damagedRects[0], TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {TestApplication::DEFAULT_SURFACE_RECT}, true, TEST_LOCATION);
 
   clippingRect = TestApplication::DEFAULT_SURFACE_RECT;
   drawTrace.Reset();
@@ -9158,8 +10070,8 @@ int utcDaliActorPartialUpdateNotRenderableActor(void)
   DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
 
   // Aligned by 16
-  Rect<int> clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates, includes 3 last frames updates
-  DALI_TEST_EQUALS<Rect<int>>(clippingRect, damagedRects[0], TEST_LOCATION);
+  Rect<int> clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
 
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
   DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
@@ -9181,11 +10093,654 @@ int utcDaliActorPartialUpdateNotRenderableActor(void)
   END_TEST;
 }
 
-int UtcDaliActorCaptureAllTouchAfterStartPropertyP(void)
+int utcDaliActorPartialUpdateChangeTransparency(void)
 {
-  TestApplication application;
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
 
-  Actor actor = Actor::New();
+  tet_infoline("Check the damaged rect with changing transparency");
+
+  const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
+
+  Actor actor                          = CreateRenderableActor();
+  actor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  actor[Actor::Property::POSITION]     = Vector3(16.0f, 16.0f, 0.0f);
+  actor[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+
+  std::vector<Rect<int>> damagedRects;
+
+  // Actor added, damaged rect is added size of actor
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+
+  // Aligned by 16
+  Rect<int> clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Make the actor transparent by changing opacity of the Renderer
+  // It changes a uniform value
+  Renderer renderer                          = actor.GetRendererAt(0);
+  renderer[DevelRenderer::Property::OPACITY] = 0.0f;
+
+  application.SendNotification();
+
+  // The damaged rect should be same
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Make the actor opaque again
+  renderer[DevelRenderer::Property::OPACITY] = 1.0f;
+
+  application.SendNotification();
+
+  // The damaged rect should not be empty
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Make the actor translucent
+  renderer[DevelRenderer::Property::OPACITY] = 0.5f;
+
+  application.SendNotification();
+
+  // The damaged rect should not be empty
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Change Renderer opacity - also translucent
+  renderer[DevelRenderer::Property::OPACITY] = 0.2f;
+
+  application.SendNotification();
+
+  // The damaged rect should not be empty
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Make the actor culled
+  actor[Actor::Property::SIZE] = Vector3(0.0f, 0.0f, 0.0f);
+
+  application.SendNotification();
+
+  // The damaged rect should be same
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_CHECK(damagedRects.size() > 0);
+  DirtyRectChecker(damagedRects, {clippingRect}, false, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Make the actor not culled again
+  actor[Actor::Property::SIZE] = Vector3(16.0f, 16.0f, 16.0f);
+
+  application.SendNotification();
+
+  // The damaged rect should not be empty
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  END_TEST;
+}
+
+int utcDaliActorPartialUpdateChangeParentOpacity(void)
+{
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
+
+  tet_infoline("Check the damaged rect with changing parent's opacity");
+
+  const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
+
+  Actor parent                          = Actor::New();
+  parent[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  parent[Actor::Property::POSITION]     = Vector3(16.0f, 16.0f, 0.0f);
+  parent[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  parent.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(parent);
+
+  Texture texture                      = CreateTexture(TextureType::TEXTURE_2D, Pixel::RGBA8888, 16u, 16u);
+  Actor   child                        = CreateRenderableActor(texture);
+  child[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  child[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  child.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  parent.Add(child);
+
+  application.SendNotification();
+
+  std::vector<Rect<int>> damagedRects;
+
+  // Actor added, damaged rect is added size of actor
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+
+  // Aligned by 16
+  Rect<int> clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Change the parent's opacity
+  parent[Actor::Property::OPACITY] = 0.5f;
+
+  application.SendNotification();
+
+  // The damaged rect should be same
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_CHECK(damagedRects.size() > 0);
+  DirtyRectChecker(damagedRects, {clippingRect}, false, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliActorPartialUpdateAddRemoveRenderer(void)
+{
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
+
+  tet_infoline("Check the damaged rect with adding / removing renderer");
+
+  const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
+
+  Actor actor                          = CreateRenderableActor();
+  actor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  actor[Actor::Property::POSITION]     = Vector3(16.0f, 16.0f, 0.0f);
+  actor[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+
+  std::vector<Rect<int>> damagedRects;
+
+  // Actor added, damaged rect is added size of actor
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+
+  // Aligned by 16
+  Rect<int> clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Remove the Renderer
+  Renderer renderer = actor.GetRendererAt(0);
+  actor.RemoveRenderer(renderer);
+
+  application.SendNotification();
+
+  // The damaged rect should be the actor area
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_CHECK(damagedRects.size() > 0);
+  DirtyRectChecker(damagedRects, {clippingRect}, false, TEST_LOCATION);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Add the Renderer again
+  actor.AddRenderer(renderer);
+
+  application.SendNotification();
+
+  // The damaged rect should be the actor area
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliActorPartialUpdate3DTransform(void)
+{
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
+
+  tet_infoline("Check the damaged rect with 3D transformed actors");
+
+  const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
+
+  Actor actor1                          = CreateRenderableActor();
+  actor1[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  actor1[Actor::Property::POSITION]     = Vector3(16.0f, 16.0f, 0.0f);
+  actor1[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  actor1.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor1);
+
+  // Add a new actor
+  Actor actor2                          = CreateRenderableActor();
+  actor2[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  actor2[Actor::Property::POSITION]     = Vector3(160.0f, 160.0f, 0.0f);
+  actor2[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  actor2.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor2);
+
+  application.SendNotification();
+
+  std::vector<Rect<int>> damagedRects;
+
+  // Actor added, damaged rect is added size of actor
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 2, TEST_LOCATION);
+
+  // Aligned by 16
+  Rect<int> clippingRect1 = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  Rect<int> clippingRect2 = Rect<int>(160, 624, 32, 32);
+  DirtyRectChecker(damagedRects, {clippingRect1, clippingRect2}, true, TEST_LOCATION);
+
+  Rect<int> surfaceRect = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  application.RenderWithPartialUpdate(damagedRects, surfaceRect);
+
+  damagedRects.clear();
+  surfaceRect = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, surfaceRect);
+
+  damagedRects.clear();
+  surfaceRect = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, surfaceRect);
+
+  // Rotate actor1 on y axis
+  actor1[Actor::Property::ORIENTATION] = Quaternion(Radian(Degree(90.0)), Vector3::YAXIS);
+
+  // Remove actor2
+  actor2.Unparent();
+
+  application.SendNotification();
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  // Should update full area
+  surfaceRect = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {surfaceRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, surfaceRect);
+
+  // Add actor2 again
+  application.GetScene().Add(actor2);
+
+  application.SendNotification();
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  // Should update full area
+  surfaceRect = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {surfaceRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, surfaceRect);
+
+  // Reset the orientation of actor1
+  actor1[Actor::Property::ORIENTATION] = Quaternion::IDENTITY;
+
+  application.SendNotification();
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  // Should update full area
+  surfaceRect = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {surfaceRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, surfaceRect);
+
+  // Make actor2 dirty
+  actor2[Actor::Property::SIZE] = Vector3(32.0f, 32.0f, 0.0f);
+
+  application.SendNotification();
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  clippingRect2 = Rect<int>(160, 608, 48, 48);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect2}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect2);
+  DALI_TEST_EQUALS(clippingRect2.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect2.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect2.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect2.height, glScissorParams.height, TEST_LOCATION);
+
+  // Remove actor1
+  actor1.Unparent();
+
+  application.SendNotification();
+
+  damagedRects.clear();
+  surfaceRect = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, surfaceRect);
+
+  // Rotate actor1 on y axis
+  actor1[Actor::Property::ORIENTATION] = Quaternion(Radian(Degree(90.0)), Vector3::YAXIS);
+
+  // Add actor1 again
+  application.GetScene().Add(actor1);
+
+  application.SendNotification();
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  // Should update full area
+  surfaceRect = Rect<int>(0, 0, TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {surfaceRect}, true, TEST_LOCATION);
+  application.RenderWithPartialUpdate(damagedRects, surfaceRect);
+
+  END_TEST;
+}
+
+int utcDaliActorPartialUpdateOneActorMultipleRenderers(void)
+{
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
+
+  tet_infoline("Check the damaged rect with one actor which has multiple renderers");
+
+  const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
+
+  Actor actor = CreateRenderableActor();
+
+  // Create another renderer
+  Geometry geometry  = CreateQuadGeometry();
+  Shader   shader    = CreateShader();
+  Renderer renderer2 = Renderer::New(geometry, shader);
+  actor.AddRenderer(renderer2);
+
+  actor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  actor[Actor::Property::POSITION]     = Vector3(16.0f, 16.0f, 0.0f);
+  actor[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor);
+
+  application.SendNotification();
+
+  DALI_TEST_EQUALS(actor.GetRendererCount(), 2u, TEST_LOCATION);
+
+  std::vector<Rect<int>> damagedRects;
+
+  // Actor added, damaged rect is added size of actor
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 2, TEST_LOCATION);
+
+  // Aligned by 16
+  Rect<int> clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect, clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Make renderer2 dirty
+  renderer2[DevelRenderer::Property::OPACITY] = 0.5f;
+
+  application.SendNotification();
+
+  // The damaged rect should be the actor area
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Make renderer2 dirty
+  renderer2[Renderer::Property::FACE_CULLING_MODE] = FaceCullingMode::BACK;
+
+  application.SendNotification();
+
+  // The damaged rect should be the actor area
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DALI_TEST_EQUALS(damagedRects.size(), 1, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int utcDaliActorPartialUpdateMultipleActorsOneRenderer(void)
+{
+  TestApplication application(
+    TestApplication::DEFAULT_SURFACE_WIDTH,
+    TestApplication::DEFAULT_SURFACE_HEIGHT,
+    TestApplication::DEFAULT_HORIZONTAL_DPI,
+    TestApplication::DEFAULT_VERTICAL_DPI,
+    true,
+    true);
+
+  tet_infoline("Check the damaged rect with multiple actors which share a same renderer");
+
+  const TestGlAbstraction::ScissorParams& glScissorParams(application.GetGlAbstraction().GetScissorParams());
+
+  Actor actor                          = CreateRenderableActor();
+  actor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  actor[Actor::Property::POSITION]     = Vector3(16.0f, 16.0f, 0.0f);
+  actor[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  actor.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor);
+
+  // Create another actor which has the same renderer with actor1
+  Actor    actor2   = Actor::New();
+  Renderer renderer = actor.GetRendererAt(0);
+  actor2.AddRenderer(renderer);
+  actor2[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  actor2[Actor::Property::POSITION]     = Vector3(16.0f, 16.0f, 0.0f);
+  actor2[Actor::Property::SIZE]         = Vector3(16.0f, 16.0f, 0.0f);
+  actor2.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+  application.GetScene().Add(actor2);
+
+  application.SendNotification();
+
+  std::vector<Rect<int>> damagedRects;
+
+  // Actor added, damaged rect is added size of actor
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  DALI_TEST_EQUALS(damagedRects.size(), 2, TEST_LOCATION);
+
+  // Aligned by 16
+  Rect<int> clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DirtyRectChecker(damagedRects, {clippingRect, clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+  DALI_TEST_EQUALS(clippingRect.x, glScissorParams.x, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.y, glScissorParams.y, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.width, glScissorParams.width, TEST_LOCATION);
+  DALI_TEST_EQUALS(clippingRect.height, glScissorParams.height, TEST_LOCATION);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  // Make renderer dirty
+  renderer[DevelRenderer::Property::OPACITY] = 0.5f;
+
+  application.SendNotification();
+
+  // The damaged rect should be the actor area
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+
+  clippingRect = Rect<int>(16, 768, 32, 32); // in screen coordinates
+  DALI_TEST_EQUALS(damagedRects.size(), 2, TEST_LOCATION);
+  DirtyRectChecker(damagedRects, {clippingRect, clippingRect}, true, TEST_LOCATION);
+
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  damagedRects.clear();
+  application.PreRenderWithPartialUpdate(TestApplication::RENDER_FRAME_INTERVAL, nullptr, damagedRects);
+  application.RenderWithPartialUpdate(damagedRects, clippingRect);
+
+  // Ensure the damaged rect is empty
+  DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliActorCaptureAllTouchAfterStartPropertyP(void)
+{
+  TestApplication application;
+
+  Actor actor = Actor::New();
   DALI_TEST_EQUALS(actor.GetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START).Get<bool>(), false, TEST_LOCATION);
   actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, true);
   DALI_TEST_EQUALS(actor.GetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START).Get<bool>(), true, TEST_LOCATION);
@@ -9197,7 +10752,44 @@ int UtcDaliActorCaptureAllTouchAfterStartPropertyP(void)
   END_TEST;
 }
 
-int UtcDaliActorCaptureAllTouchAfterStartPropertyN(void)
+int UtcDaliActorCaptureAllTouchAfterStartPropertyN(void)
+{
+  TestApplication application;
+
+  Actor actor = Actor::New();
+
+  // Make sure setting invalid types does not cause a crash
+  try
+  {
+    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, 1.0f);
+    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Vector2::ONE);
+    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Vector3::ONE);
+    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Vector4::ONE);
+    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Property::Map());
+    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Property::Array());
+    tet_result(TET_PASS);
+  }
+  catch(...)
+  {
+    tet_result(TET_FAIL);
+  }
+  END_TEST;
+}
+
+int UtcDaliActorTouchAreaOffsetPropertyP(void)
+{
+  TestApplication application;
+
+  Actor     actor           = Actor::New();
+  Rect<int> touchAreaOffset = actor.GetProperty(DevelActor::Property::TOUCH_AREA_OFFSET).Get<Rect<int>>();
+  DALI_TEST_EQUALS(Rect<int>(0, 0, 0, 0), touchAreaOffset, TEST_LOCATION);
+  actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Rect<int>(10, 20, 30, 40));
+  touchAreaOffset = actor.GetProperty(DevelActor::Property::TOUCH_AREA_OFFSET).Get<Rect<int>>();
+  DALI_TEST_EQUALS(Rect<int>(10, 20, 30, 40), touchAreaOffset, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliActorTouchAreaOffsetPropertyN(void)
 {
   TestApplication application;
 
@@ -9206,66 +10798,295 @@ int UtcDaliActorCaptureAllTouchAfterStartPropertyN(void)
   // Make sure setting invalid types does not cause a crash
   try
   {
-    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, 1.0f);
-    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Vector2::ONE);
-    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Vector3::ONE);
-    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Vector4::ONE);
-    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Property::Map());
-    actor.SetProperty(DevelActor::Property::CAPTURE_ALL_TOUCH_AFTER_START, Property::Array());
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, 1.0f);
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector2::ONE);
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector3::ONE);
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector4::ONE);
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Property::Map());
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Property::Array());
     tet_result(TET_PASS);
   }
   catch(...)
   {
-    tet_result(TET_FAIL);
+    tet_result(TET_FAIL);
+  }
+  END_TEST;
+}
+
+int UtcDaliActorLowerBelowNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    Dali::Actor arg1;
+    instance.LowerBelow(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorRaiseAboveNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    Dali::Actor arg1;
+    instance.RaiseAbove(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorRaiseToTopNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    instance.RaiseToTop();
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorAddRendererNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    Dali::Renderer arg1;
+    instance.AddRenderer(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorTouchedSignalNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    instance.TouchedSignal();
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorTranslateByNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    Dali::Vector3 arg1;
+    instance.TranslateBy(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorFindChildByIdNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    unsigned int arg1 = 0u;
+    instance.FindChildById(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorGetRendererAtNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    unsigned int arg1 = 0u;
+    instance.GetRendererAt(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorHoveredSignalNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    instance.HoveredSignal();
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorLowerToBottomNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    instance.LowerToBottom();
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorOnSceneSignalNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    instance.OnSceneSignal();
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorOffSceneSignalNegative(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    instance.OffSceneSignal();
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorRemoveRendererNegative01(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    unsigned int arg1 = 0u;
+    instance.RemoveRenderer(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
+  END_TEST;
+}
+
+int UtcDaliActorRemoveRendererNegative02(void)
+{
+  TestApplication application;
+  Dali::Actor     instance;
+  try
+  {
+    Dali::Renderer arg1;
+    instance.RemoveRenderer(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
   }
   END_TEST;
 }
 
-int UtcDaliActorTouchAreaOffsetPropertyP(void)
+int UtcDaliActorFindChildByNameNegative(void)
 {
   TestApplication application;
-
-  Actor     actor           = Actor::New();
-  Rect<int> touchAreaOffset = actor.GetProperty(DevelActor::Property::TOUCH_AREA_OFFSET).Get<Rect<int>>();
-  DALI_TEST_EQUALS(Rect<int>(0, 0, 0, 0), touchAreaOffset, TEST_LOCATION);
-  actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Rect<int>(10, 20, 30, 40));
-  touchAreaOffset = actor.GetProperty(DevelActor::Property::TOUCH_AREA_OFFSET).Get<Rect<int>>();
-  DALI_TEST_EQUALS(Rect<int>(10, 20, 30, 40), touchAreaOffset, TEST_LOCATION);
+  Dali::Actor     instance;
+  try
+  {
+    std::string arg1;
+    instance.FindChildByName(arg1);
+    DALI_TEST_CHECK(false); // Should not get here
+  }
+  catch(...)
+  {
+    DALI_TEST_CHECK(true); // We expect an assert
+  }
   END_TEST;
 }
 
-int UtcDaliActorTouchAreaOffsetPropertyN(void)
+int UtcDaliActorSetResizePolicyNegative(void)
 {
   TestApplication application;
-
-  Actor actor = Actor::New();
-
-  // Make sure setting invalid types does not cause a crash
+  Dali::Actor     instance;
   try
   {
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, 1.0f);
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector2::ONE);
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector3::ONE);
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector4::ONE);
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Property::Map());
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Property::Array());
-    tet_result(TET_PASS);
+    Dali::ResizePolicy::Type arg1 = ResizePolicy::USE_NATURAL_SIZE;
+    Dali::Dimension::Type    arg2 = Dimension::ALL_DIMENSIONS;
+    instance.SetResizePolicy(arg1, arg2);
+    DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
   {
-    tet_result(TET_FAIL);
+    DALI_TEST_CHECK(true); // We expect an assert
   }
   END_TEST;
 }
 
-int UtcDaliActorLowerBelowNegative(void)
+int UtcDaliActorOnRelayoutSignalNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    Dali::Actor arg1;
-    instance.LowerBelow(arg1);
+    instance.OnRelayoutSignal();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9275,14 +11096,13 @@ int UtcDaliActorLowerBelowNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorRaiseAboveNegative(void)
+int UtcDaliActorWheelEventSignalNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    Dali::Actor arg1;
-    instance.RaiseAbove(arg1);
+    instance.WheelEventSignal();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9292,13 +11112,14 @@ int UtcDaliActorRaiseAboveNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorRaiseToTopNegative(void)
+int UtcDaliActorGetHeightForWidthNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.RaiseToTop();
+    float arg1 = 0.0f;
+    instance.GetHeightForWidth(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9308,14 +11129,14 @@ int UtcDaliActorRaiseToTopNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorAddRendererNegative(void)
+int UtcDaliActorGetWidthForHeightNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    Dali::Renderer arg1;
-    instance.AddRenderer(arg1);
+    float arg1 = 0.0f;
+    instance.GetWidthForHeight(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9325,13 +11146,13 @@ int UtcDaliActorAddRendererNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorTouchedSignalNegative(void)
+int UtcDaliActorLayoutDirectionChangedSignalNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.TouchedSignal();
+    instance.LayoutDirectionChangedSignal();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9341,14 +11162,14 @@ int UtcDaliActorTouchedSignalNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorTranslateByNegative(void)
+int UtcDaliActorAddNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    Dali::Vector3 arg1;
-    instance.TranslateBy(arg1);
+    Dali::Actor arg1;
+    instance.Add(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9358,14 +11179,13 @@ int UtcDaliActorTranslateByNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorFindChildByIdNegative(void)
+int UtcDaliActorLowerNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    unsigned int arg1 = 0u;
-    instance.FindChildById(arg1);
+    instance.Lower();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9375,14 +11195,13 @@ int UtcDaliActorFindChildByIdNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorGetRendererAtNegative(void)
+int UtcDaliActorRaiseNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    unsigned int arg1 = 0u;
-    instance.GetRendererAt(arg1);
+    instance.Raise();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9392,13 +11211,14 @@ int UtcDaliActorGetRendererAtNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorHoveredSignalNegative(void)
+int UtcDaliActorRemoveNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.HoveredSignal();
+    Dali::Actor arg1;
+    instance.Remove(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9408,13 +11228,14 @@ int UtcDaliActorHoveredSignalNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorLowerToBottomNegative(void)
+int UtcDaliActorScaleByNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.LowerToBottom();
+    Dali::Vector3 arg1;
+    instance.ScaleBy(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9424,13 +11245,13 @@ int UtcDaliActorLowerToBottomNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorOnSceneSignalNegative(void)
+int UtcDaliActorGetLayerNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.OnSceneSignal();
+    instance.GetLayer();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9440,13 +11261,14 @@ int UtcDaliActorOnSceneSignalNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorOffSceneSignalNegative(void)
+int UtcDaliActorRotateByNegative01(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.OffSceneSignal();
+    Dali::Quaternion arg1;
+    instance.RotateBy(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9456,14 +11278,15 @@ int UtcDaliActorOffSceneSignalNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorRemoveRendererNegative01(void)
+int UtcDaliActorRotateByNegative02(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    unsigned int arg1 = 0u;
-    instance.RemoveRenderer(arg1);
+    Dali::Radian  arg1;
+    Dali::Vector3 arg2;
+    instance.RotateBy(arg1, arg2);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9473,14 +11296,13 @@ int UtcDaliActorRemoveRendererNegative01(void)
   END_TEST;
 }
 
-int UtcDaliActorRemoveRendererNegative02(void)
+int UtcDaliActorUnparentNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    Dali::Renderer arg1;
-    instance.RemoveRenderer(arg1);
+    instance.Unparent();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9490,14 +11312,14 @@ int UtcDaliActorRemoveRendererNegative02(void)
   END_TEST;
 }
 
-int UtcDaliActorFindChildByNameNegative(void)
+int UtcDaliActorGetChildAtNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    std::string arg1;
-    instance.FindChildByName(arg1);
+    unsigned int arg1 = 0u;
+    instance.GetChildAt(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9507,15 +11329,13 @@ int UtcDaliActorFindChildByNameNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorSetResizePolicyNegative(void)
+int UtcDaliActorGetChildCountNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    Dali::ResizePolicy::Type arg1 = ResizePolicy::USE_NATURAL_SIZE;
-    Dali::Dimension::Type    arg2 = Dimension::ALL_DIMENSIONS;
-    instance.SetResizePolicy(arg1, arg2);
+    instance.GetChildCount();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9525,13 +11345,13 @@ int UtcDaliActorSetResizePolicyNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorOnRelayoutSignalNegative(void)
+int UtcDaliActorGetTargetSizeNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.OnRelayoutSignal();
+    instance.GetTargetSize();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9541,13 +11361,17 @@ int UtcDaliActorOnRelayoutSignalNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorWheelEventSignalNegative(void)
+int UtcDaliActorScreenToLocalNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.WheelEventSignal();
+    float arg1 = 0.0f;
+    float arg2 = 0.0f;
+    float arg3 = 0.0f;
+    float arg4 = 0.0f;
+    instance.ScreenToLocal(arg1, arg2, arg3, arg4);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9557,14 +11381,13 @@ int UtcDaliActorWheelEventSignalNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorGetHeightForWidthNegative(void)
+int UtcDaliActorGetNaturalSizeNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    float arg1 = 0.0f;
-    instance.GetHeightForWidth(arg1);
+    instance.GetNaturalSize();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9574,14 +11397,14 @@ int UtcDaliActorGetHeightForWidthNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorGetWidthForHeightNegative(void)
+int UtcDaliActorGetRelayoutSizeNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    float arg1 = 0.0f;
-    instance.GetWidthForHeight(arg1);
+    Dali::Dimension::Type arg1 = Dimension::HEIGHT;
+    instance.GetRelayoutSize(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9591,13 +11414,14 @@ int UtcDaliActorGetWidthForHeightNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorLayoutDirectionChangedSignalNegative(void)
+int UtcDaliActorGetResizePolicyNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.LayoutDirectionChangedSignal();
+    Dali::Dimension::Type arg1 = Dimension::ALL_DIMENSIONS;
+    instance.GetResizePolicy(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9607,14 +11431,13 @@ int UtcDaliActorLayoutDirectionChangedSignalNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorAddNegative(void)
+int UtcDaliActorGetRendererCountNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    Dali::Actor arg1;
-    instance.Add(arg1);
+    instance.GetRendererCount();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9624,13 +11447,13 @@ int UtcDaliActorAddNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorLowerNegative(void)
+int UtcDaliActorGetParentNegative(void)
 {
   TestApplication application;
   Dali::Actor     instance;
   try
   {
-    instance.Lower();
+    instance.GetParent();
     DALI_TEST_CHECK(false); // Should not get here
   }
   catch(...)
@@ -9640,368 +11463,879 @@ int UtcDaliActorLowerNegative(void)
   END_TEST;
 }
 
-int UtcDaliActorRaiseNegative(void)
-{
-  TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    instance.Raise();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+int UtcDaliActorPropertyBlendEquation(void)
+{
+  TestApplication application;
+
+  tet_infoline("Test SetProperty AdvancedBlendEquation");
+
+  Geometry geometry  = CreateQuadGeometry();
+  Shader   shader    = CreateShader();
+  Renderer renderer1 = Renderer::New(geometry, shader);
+
+  Actor actor = Actor::New();
+  actor.SetProperty(Actor::Property::OPACITY, 0.1f);
+
+  actor.AddRenderer(renderer1);
+  actor.SetProperty(Actor::Property::SIZE, Vector2(400, 400));
+  application.GetScene().Add(actor);
+
+  if(!Dali::Capabilities::IsBlendEquationSupported(DevelBlendEquation::SCREEN))
+  {
+    actor.SetProperty(Dali::DevelActor::Property::BLEND_EQUATION, Dali::DevelBlendEquation::SCREEN);
+    int equation = actor.GetProperty<int>(Dali::DevelActor::Property::BLEND_EQUATION);
+    DALI_TEST_EQUALS((Dali::DevelBlendEquation::SCREEN == equation), false, TEST_LOCATION);
+  }
+
+  if(Dali::Capabilities::IsBlendEquationSupported(DevelBlendEquation::SCREEN))
+  {
+    actor.SetProperty(Dali::DevelActor::Property::BLEND_EQUATION, Dali::DevelBlendEquation::SCREEN);
+    int equation = actor.GetProperty<int>(Dali::DevelActor::Property::BLEND_EQUATION);
+    DALI_TEST_EQUALS((Dali::DevelBlendEquation::SCREEN == equation), true, TEST_LOCATION);
+  }
+
+  Renderer renderer2 = Renderer::New(geometry, shader);
+  actor.AddRenderer(renderer2);
+
+  END_TEST;
+}
+
+int UtcDaliActorRegisterProperty(void)
+{
+  tet_infoline("Test property registration and uniform map update\n");
+
+  TestApplication application;
+
+  Geometry geometry  = CreateQuadGeometry();
+  Shader   shader    = CreateShader();
+  Renderer renderer1 = Renderer::New(geometry, shader);
+  Renderer renderer2 = Renderer::New(geometry, shader);
+
+  Actor actor1 = Actor::New();
+  actor1.AddRenderer(renderer1);
+  actor1.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  actor1.RegisterProperty("uCustom", 1);
+  application.GetScene().Add(actor1);
+
+  Actor actor2 = Actor::New();
+  actor2.AddRenderer(renderer2);
+  actor2.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
+  application.GetScene().Add(actor2);
+
+  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
+  TraceCallStack&    callStack     = glAbstraction.GetSetUniformTrace();
+  glAbstraction.EnableSetUniformCallTrace(true);
+
+  application.SendNotification();
+  application.Render();
+
+  std::stringstream out;
+  out.str("1");
+  std::string params;
+
+  // Test uniform value of the custom property
+  DALI_TEST_CHECK(callStack.FindMethodAndGetParameters("uCustom", params));
+  DALI_TEST_EQUALS(out.str(), params, TEST_LOCATION);
+
+  // Make invisible
+  actor1[Actor::Property::VISIBLE] = false;
+
+  application.SendNotification();
+  application.Render();
+
+  // Make visible again
+  actor1[Actor::Property::VISIBLE] = true;
+  actor1["uCustom"]                = 2;
+
+  glAbstraction.ResetSetUniformCallStack();
+
+  application.SendNotification();
+  application.Render();
+
+  out.str("2");
+
+  // The uniform value should not be changed
+  DALI_TEST_CHECK(callStack.FindMethodAndGetParameters("uCustom", params));
+  DALI_TEST_EQUALS(out.str(), params, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorRemoveNegative(void)
+int UtcDaliActorDoesWantedHitTest(void)
 {
-  TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    Dali::Actor arg1;
-    instance.Remove(arg1);
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
+  struct HitTestData
   {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
-  END_TEST;
-}
+  public:
+    HitTestData(const Vector3& scale, const Vector2& touchPoint, bool result)
+    : mScale(scale),
+      mTouchPoint(touchPoint),
+      mResult(result)
+    {
+    }
 
-int UtcDaliActorScaleByNegative(void)
-{
-  TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    Dali::Vector3 arg1;
-    instance.ScaleBy(arg1);
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
-  END_TEST;
-}
+    Vector3 mScale;
+    Vector2 mTouchPoint;
+    bool    mResult;
+  };
 
-int UtcDaliActorGetLayerNegative(void)
-{
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    instance.GetLayer();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
+  tet_infoline(" UtcDaliActorDoesWantedHitTest");
+
+  // Fill a vector with different hit tests.
+  struct HitTestData* hitTestData[] = {
+    //                    scale                     touch point           result
+    new HitTestData(Vector3(100.f, 100.f, 1.f), Vector2(289.f, 400.f), true),  // touch point close to the right edge (inside)
+    new HitTestData(Vector3(100.f, 100.f, 1.f), Vector2(291.f, 400.f), false), // touch point close to the right edge (outside)
+    new HitTestData(Vector3(110.f, 100.f, 1.f), Vector2(291.f, 400.f), true),  // same point as above with a wider scale. Should be inside.
+    new HitTestData(Vector3(100.f, 100.f, 1.f), Vector2(200.f, 451.f), false), // touch point close to the down edge (outside)
+    new HitTestData(Vector3(100.f, 110.f, 1.f), Vector2(200.f, 451.f), true),  // same point as above with a wider scale. Should be inside.
+    NULL,
+  };
+
+  // get the root layer
+  Actor actor = Actor::New();
+  actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  Actor lowerActor = Actor::New();
+  lowerActor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+  lowerActor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+
+  // actor and lowerActor have no relationship.
+  application.GetScene().Add(lowerActor);
+  application.GetScene().Add(actor);
+
+  ResetTouchCallbacks();
+  gHitTestTouchCallBackCalled = false;
+
+  unsigned int index = 0;
+  while(NULL != hitTestData[index])
   {
-    DALI_TEST_CHECK(true); // We expect an assert
+    actor.SetProperty(Actor::Property::SIZE, Vector2(1.f, 1.f));
+    actor.SetProperty(Actor::Property::SCALE, Vector3(hitTestData[index]->mScale.x, hitTestData[index]->mScale.y, hitTestData[index]->mScale.z));
+
+    lowerActor.SetProperty(Actor::Property::SIZE, Vector2(1.f, 1.f));
+    lowerActor.SetProperty(Actor::Property::SCALE, Vector3(hitTestData[index]->mScale.x, hitTestData[index]->mScale.y, hitTestData[index]->mScale.z));
+
+    // flush the queue and render once
+    application.SendNotification();
+    application.Render();
+
+    DALI_TEST_CHECK(!gTouchCallBackCalled);
+    DALI_TEST_CHECK(!gTouchCallBackCalled2);
+    DALI_TEST_CHECK(!gHitTestTouchCallBackCalled);
+
+    // connect to its touch signal
+    actor.TouchedSignal().Connect(TestTouchCallback);
+    lowerActor.TouchedSignal().Connect(TestTouchCallback2);
+
+    // connect to its hit-test signal
+    Dali::DevelActor::HitTestResultSignal(actor).Connect(TestHitTestTouchCallback);
+
+    Dali::Integration::Point point;
+    point.SetState(PointState::DOWN);
+    point.SetScreenPosition(Vector2(hitTestData[index]->mTouchPoint.x, hitTestData[index]->mTouchPoint.y));
+    Dali::Integration::TouchEvent event;
+    event.AddPoint(point);
+
+    // flush the queue and render once
+    application.SendNotification();
+    application.Render();
+    application.ProcessEvent(event);
+
+    // check hit-test events
+    DALI_TEST_CHECK(gHitTestTouchCallBackCalled == hitTestData[index]->mResult);
+    // Passed all hit-tests of actor.
+    DALI_TEST_CHECK(gTouchCallBackCalled == false);
+    // The lowerActor was hit-tested.
+    DALI_TEST_CHECK(gTouchCallBackCalled2 == hitTestData[index]->mResult);
+
+    if(gTouchCallBackCalled2 != hitTestData[index]->mResult)
+      tet_printf("Test failed:\nScale %f %f %f\nTouchPoint %f, %f\nResult %d\n",
+                 hitTestData[index]->mScale.x,
+                 hitTestData[index]->mScale.y,
+                 hitTestData[index]->mScale.z,
+                 hitTestData[index]->mTouchPoint.x,
+                 hitTestData[index]->mTouchPoint.y,
+                 hitTestData[index]->mResult);
+
+    ResetTouchCallbacks();
+    gHitTestTouchCallBackCalled = false;
+    ++index;
   }
   END_TEST;
 }
 
-int UtcDaliActorRotateByNegative01(void)
+int UtcDaliActorAllowOnlyOwnTouchPropertyP(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    Dali::Quaternion arg1;
-    instance.RotateBy(arg1);
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  Actor actor = Actor::New();
+  DALI_TEST_EQUALS(actor.GetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH).Get<bool>(), false, TEST_LOCATION);
+  actor.SetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH, true);
+  DALI_TEST_EQUALS(actor.GetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH).Get<bool>(), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetPropertyType(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH), Property::BOOLEAN, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsPropertyWritable(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH), true, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsPropertyAnimatable(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.IsPropertyAConstraintInput(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH), false, TEST_LOCATION);
+  DALI_TEST_EQUALS(actor.GetPropertyName(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH), "allowOnlyOwnTouch", TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliActorRotateByNegative02(void)
+int UtcDaliActorAllowOnlyOwnTouchPropertyN(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
+
+  Actor actor = Actor::New();
+
+  // Make sure setting invalid types does not cause a crash
   try
   {
-    Dali::Radian  arg1;
-    Dali::Vector3 arg2;
-    instance.RotateBy(arg1, arg2);
-    DALI_TEST_CHECK(false); // Should not get here
+    actor.SetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH, 1.0f);
+    actor.SetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH, Vector2::ONE);
+    actor.SetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH, Vector3::ONE);
+    actor.SetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH, Vector4::ONE);
+    actor.SetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH, Property::Map());
+    actor.SetProperty(DevelActor::Property::ALLOW_ONLY_OWN_TOUCH, Property::Array());
+    tet_result(TET_PASS);
   }
   catch(...)
   {
-    DALI_TEST_CHECK(true); // We expect an assert
+    tet_result(TET_FAIL);
   }
   END_TEST;
 }
 
-int UtcDaliActorUnparentNegative(void)
+int UtcDaliActorCalculateWorldTransform01(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    instance.Unparent();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor position inheritance produces right transform matrix");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]   = Vector3(0.0f, 0.0f, 0.0f);
+  branchActor[Actor::Property::POSITION] = Vector3(100.0f, 100.0f, 0.0f);
+  leafActor[Actor::Property::POSITION]   = Vector3(100.0f, 50.0f, 30.0f);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  // Set anchor point to the same value as parent origin
+  rootActor[Actor::Property::PARENT_ORIGIN]   = ParentOrigin::TOP_LEFT;
+  branchActor[Actor::Property::PARENT_ORIGIN] = ParentOrigin::TOP_LEFT;
+  leafActor[Actor::Property::PARENT_ORIGIN]   = ParentOrigin::TOP_LEFT;
+
+  rootActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+  branchActor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  leafActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  application.SendNotification();
+  application.Render(0);
+  application.SendNotification();
+  application.Render(0);
+
+  Matrix m = DevelActor::GetWorldTransform(leafActor);
+
+  Matrix actualMatrix = leafActor.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX);
+  DALI_TEST_EQUALS(m, actualMatrix, 0.001f, TEST_LOCATION);
+
+  Vector3    worldPos;
+  Vector3    worldScale;
+  Quaternion worldRotation;
+  m.GetTransformComponents(worldPos, worldRotation, worldScale);
+  DALI_TEST_EQUALS(worldPos, Vector3(200.0f, 150.0f, 30.0f), 0.0001f, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorGetChildAtNegative(void)
+int UtcDaliActorCalculateWorldTransform02(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    unsigned int arg1 = 0u;
-    instance.GetChildAt(arg1);
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor position produces right transform matrix");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]   = Vector3(0.0f, 0.0f, 0.0f);
+  branchActor[Actor::Property::POSITION] = Vector3(100.0f, 100.0f, 0.0f);
+  leafActor[Actor::Property::POSITION]   = Vector3(100.0f, 50.0f, 30.0f);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  // Set anchor point to the same value as parent origin
+  rootActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+  branchActor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  leafActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  leafActor[Actor::Property::INHERIT_POSITION]    = false;
+  leafActor[Actor::Property::INHERIT_ORIENTATION] = false;
+  leafActor[Actor::Property::INHERIT_SCALE]       = false;
+
+  application.SendNotification();
+  application.Render(0);
+  application.SendNotification();
+  application.Render(0);
+
+  Matrix m = DevelActor::GetWorldTransform(leafActor);
+
+  Matrix actualMatrix = leafActor.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX);
+  DALI_TEST_EQUALS(m, actualMatrix, 0.001f, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorGetChildCountNegative(void)
+int UtcDaliActorCalculateWorldTransform03(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    instance.GetChildCount();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor position produces right transform matrix");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]   = Vector3(0.0f, 0.0f, 0.0f);
+  branchActor[Actor::Property::POSITION] = Vector3(100.0f, 100.0f, 0.0f);
+  leafActor[Actor::Property::POSITION]   = Vector3(100.0f, 50.0f, 30.0f);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  // Set anchor point to the same value as parent origin
+  rootActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+  branchActor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  leafActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  leafActor[Actor::Property::INHERIT_POSITION]    = true;
+  leafActor[Actor::Property::INHERIT_ORIENTATION] = false;
+  leafActor[Actor::Property::INHERIT_SCALE]       = false;
+
+  application.SendNotification();
+  application.Render(0);
+  application.SendNotification();
+  application.Render(0);
+
+  Matrix m = DevelActor::GetWorldTransform(leafActor);
+
+  Matrix actualMatrix = leafActor.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX);
+  DALI_TEST_EQUALS(m, actualMatrix, 0.001f, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorGetTargetSizeNegative(void)
+int UtcDaliActorCalculateWorldTransform04(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    instance.GetTargetSize();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor inheritance scale/orientation produces right transform matrix");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]    = Vector3(100.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]       = Vector3(2.0f, 2.0f, 2.0f);
+  rootActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  // Set anchor point to the same value as parent origin
+  rootActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::CENTER;
+  rootActor[Actor::Property::PARENT_ORIGIN]  = ParentOrigin::CENTER;
+  branchActor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  leafActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+
+  branchActor[Actor::Property::POSITION] = Vector3(100.0f, 100.0f, 0.0f);
+  leafActor[Actor::Property::POSITION]   = Vector3(100.0f, 50.0f, 30.0f);
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  application.SendNotification();
+  application.Render(0);
+  application.SendNotification();
+  application.Render(0);
+
+  Matrix m = DevelActor::GetWorldTransform(leafActor);
+
+  Matrix actualMatrix = leafActor.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX);
+  DALI_TEST_EQUALS(m, actualMatrix, 0.001f, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorScreenToLocalNegative(void)
+int UtcDaliActorCalculateWorldTransform05(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    float arg1 = 0.0f;
-    float arg2 = 0.0f;
-    float arg3 = 0.0f;
-    float arg4 = 0.0f;
-    instance.ScreenToLocal(arg1, arg2, arg3, arg4);
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor inheritance of scale produces right transform matrix");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]    = Vector3(100.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]       = Vector3(2.0f, 2.0f, 2.0f);
+  rootActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  // Set anchor point to the same value as parent origin
+  rootActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::CENTER;
+  rootActor[Actor::Property::PARENT_ORIGIN]  = ParentOrigin::CENTER;
+  branchActor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  leafActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+
+  branchActor[Actor::Property::POSITION] = Vector3(100.0f, 100.0f, 0.0f);
+  leafActor[Actor::Property::POSITION]   = Vector3(100.0f, 50.0f, 30.0f);
+
+  leafActor[Actor::Property::INHERIT_POSITION]    = false;
+  leafActor[Actor::Property::INHERIT_ORIENTATION] = false;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  application.SendNotification();
+  application.Render(0);
+  application.SendNotification();
+  application.Render(0);
+
+  Matrix m = DevelActor::GetWorldTransform(leafActor);
+
+  Matrix actualMatrix = leafActor.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX);
+  DALI_TEST_EQUALS(m, actualMatrix, 0.001f, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorGetNaturalSizeNegative(void)
+int UtcDaliActorCalculateWorldTransform06(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    instance.GetNaturalSize();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor inheritance of scale produces right transform matrix");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]    = Vector3(100.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]       = Vector3(2.0f, 2.0f, 2.0f);
+  rootActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  // Set anchor point to the same value as parent origin
+  rootActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::CENTER;
+  rootActor[Actor::Property::PARENT_ORIGIN]  = ParentOrigin::CENTER;
+  branchActor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+  leafActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::TOP_LEFT;
+
+  branchActor[Actor::Property::POSITION]    = Vector3(100.0f, 30.0f, -50.0f);
+  branchActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(45.0f), Vector3::XAXIS);
+  leafActor[Actor::Property::POSITION]      = Vector3(100.0f, 50.0f, 30.0f);
+
+  leafActor[Actor::Property::INHERIT_POSITION] = false;
+  leafActor[Actor::Property::INHERIT_SCALE]    = false;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  application.SendNotification();
+  application.Render(0);
+  application.SendNotification();
+  application.Render(0);
+
+  Matrix m = DevelActor::GetWorldTransform(leafActor);
+
+  Matrix actualMatrix = leafActor.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX);
+  DALI_TEST_EQUALS(m, actualMatrix, 0.001f, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorGetRelayoutSizeNegative(void)
+int UtcDaliActorCalculateWorldTransform07(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    Dali::Dimension::Type arg1 = Dimension::HEIGHT;
-    instance.GetRelayoutSize(arg1);
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor inheritance of scale produces right transform matrix");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]    = Vector3(100.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]       = Vector3(2.0f, 2.0f, 2.0f);
+  rootActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  // Set anchor point to the same value as parent origin
+  rootActor[Actor::Property::ANCHOR_POINT]   = AnchorPoint::CENTER;
+  rootActor[Actor::Property::PARENT_ORIGIN]  = ParentOrigin::CENTER;
+  branchActor[Actor::Property::ANCHOR_POINT] = AnchorPoint::TOP_LEFT;
+
+  // This should be ignored.
+  leafActor[Actor::Property::PARENT_ORIGIN] = ParentOrigin::CENTER;
+  leafActor[Actor::Property::ANCHOR_POINT]  = AnchorPoint::CENTER;
+
+  branchActor[Actor::Property::POSITION]    = Vector3(100.0f, 30.0f, -50.0f);
+  branchActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(45.0f), Vector3::XAXIS);
+  leafActor[Actor::Property::POSITION]      = Vector3(100.0f, 50.0f, 30.0f);
+
+  leafActor[Actor::Property::INHERIT_POSITION]           = false;
+  leafActor[Actor::Property::INHERIT_SCALE]              = false;
+  leafActor[Actor::Property::POSITION_USES_ANCHOR_POINT] = false;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  application.SendNotification();
+  application.Render(0);
+  application.SendNotification();
+  application.Render(0);
+
+  Matrix m = DevelActor::GetWorldTransform(leafActor);
+
+  Matrix actualMatrix = leafActor.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX);
+  DALI_TEST_EQUALS(m, actualMatrix, 0.001f, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorGetResizePolicyNegative(void)
+int UtcDaliActorCalculateWorldTransform08(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
+
+  tet_infoline("Test that actor inheritance of scale produces right transform matrix");
+
+  Vector3 solutions[] = {Vector3(250, 0, 0), Vector3(0, 250, 0), Vector3(650, 0, 0), Vector3(0, 250, 0), Vector3(650, 0, 0), Vector3(400, 250, 0), Vector3(200, -50, 0), Vector3(500, 200, 0)};
+
+  struct TestCase
   {
-    Dali::Dimension::Type arg1 = Dimension::ALL_DIMENSIONS;
-    instance.GetResizePolicy(arg1);
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
+    bool translation;
+    bool rotation;
+    bool scaling;
+  };
+  TestCase testCases[] = {
+    {false, false, true},
+    {false, true, false},
+    {true, false, false},
+    {false, true, true},
+    {true, false, true},
+    {true, true, false},
+    {false, false, false},
+    {true, true, true},
+  };
+
+  Actor rootActor = Actor::New();
+  Actor leafActor = Actor::New();
+
+  rootActor[Actor::Property::POSITION]      = Vector3(0.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]         = Vector3(1.0f, 2.0f, 1.0f);
+  rootActor[Actor::Property::ORIENTATION]   = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
+  rootActor[Actor::Property::SIZE]          = Vector2(200, 400);
+  rootActor[Actor::Property::ANCHOR_POINT]  = AnchorPoint::CENTER;
+  rootActor[Actor::Property::PARENT_ORIGIN] = ParentOrigin::CENTER;
+
+  leafActor[Actor::Property::POSITION]                   = Vector3(0.0f, -50.0f, 0.0f);
+  leafActor[Actor::Property::SCALE]                      = Vector3(1.0f, 1.0f, 1.0f);
+  leafActor[Actor::Property::ORIENTATION]                = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
+  leafActor[Actor::Property::SIZE]                       = Vector2(200, 400);
+  leafActor[Actor::Property::ANCHOR_POINT]               = AnchorPoint::BOTTOM_CENTER;
+  leafActor[Actor::Property::PARENT_ORIGIN]              = ParentOrigin::TOP_CENTER;
+  leafActor[Actor::Property::POSITION_USES_ANCHOR_POINT] = true;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(leafActor);
+
+  for(uint32_t i = 0; i < 8; ++i)
   {
-    DALI_TEST_CHECK(true); // We expect an assert
+    leafActor[Actor::Property::INHERIT_POSITION]    = testCases[i].translation;
+    leafActor[Actor::Property::INHERIT_ORIENTATION] = testCases[i].rotation;
+    leafActor[Actor::Property::INHERIT_SCALE]       = testCases[i].scaling;
+
+    application.SendNotification();
+    application.Render(0);
+    application.SendNotification();
+    application.Render(0);
+
+    Matrix m            = DevelActor::GetWorldTransform(leafActor);
+    Matrix actualMatrix = leafActor.GetCurrentProperty<Matrix>(Actor::Property::WORLD_MATRIX);
+
+    Vector3 worldPosition1 = Vector3(m.GetTranslation());
+    Vector3 worldPosition2 = Vector3(actualMatrix.GetTranslation());
+
+    DALI_TEST_EQUALS(solutions[i], worldPosition1, 0.001f, TEST_LOCATION);
+    DALI_TEST_EQUALS(solutions[i], worldPosition2, 0.001f, TEST_LOCATION);
   }
+
   END_TEST;
 }
 
-int UtcDaliActorGetRendererCountNegative(void)
+int UtcDaliActorCalculateWorldColor01(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    instance.GetRendererCount();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor inheritance of color produces right final color");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]    = Vector3(100.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]       = Vector3(2.0f, 2.0f, 2.0f);
+  rootActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  rootActor[Actor::Property::COLOR] = Color::WHITE;
+  Vector4 testColor1(1.0f, 1.0f, 0.5f, 0.8f);
+  branchActor[Actor::Property::COLOR] = testColor1;
+  leafActor[Actor::Property::COLOR]   = Vector4(0.1f, 0.5f, 0.5f, 0.8f);
+
+  // Default is to inherit:
+  leafActor[Actor::Property::COLOR_MODE] = ColorMode::USE_OWN_MULTIPLY_PARENT_ALPHA;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  application.SendNotification();
+  application.Render(16);
+  Vector4 color = branchActor.GetCurrentProperty<Vector4>(Actor::Property::COLOR);
+  DALI_TEST_EQUALS(color, testColor1, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+  color = branchActor.GetCurrentProperty<Vector4>(Actor::Property::COLOR);
+  DALI_TEST_EQUALS(color, testColor1, TEST_LOCATION);
+
+  application.SendNotification();
+  application.Render(16);
+  color = branchActor.GetCurrentProperty<Vector4>(Actor::Property::COLOR);
+  DALI_TEST_EQUALS(color, testColor1, TEST_LOCATION);
+
+  color = DevelActor::GetWorldColor(leafActor);
+
+  Vector4 actualColor = leafActor.GetCurrentProperty<Vector4>(Actor::Property::WORLD_COLOR);
+  DALI_TEST_EQUALS(color, actualColor, 0.001f, TEST_LOCATION);
+
   END_TEST;
 }
 
-int UtcDaliActorGetParentNegative(void)
+int UtcDaliActorCalculateWorldColor02(void)
 {
   TestApplication application;
-  Dali::Actor     instance;
-  try
-  {
-    instance.GetParent();
-    DALI_TEST_CHECK(false); // Should not get here
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK(true); // We expect an assert
-  }
+
+  tet_infoline("Test that actor uses own color");
+
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
+
+  rootActor[Actor::Property::POSITION]    = Vector3(100.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]       = Vector3(2.0f, 2.0f, 2.0f);
+  rootActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
+
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  rootActor[Actor::Property::COLOR]   = Color::WHITE;
+  branchActor[Actor::Property::COLOR] = Vector4(1.0f, 1.0f, 0.5f, 0.8f);
+  leafActor[Actor::Property::COLOR]   = Vector4(0.1f, 0.5f, 0.5f, 0.8f);
+
+  leafActor[Actor::Property::COLOR_MODE] = ColorMode::USE_OWN_COLOR;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  application.SendNotification();
+  application.Render(0);
+
+  Vector4 color = DevelActor::GetWorldColor(leafActor);
+
+  Vector4 actualColor = leafActor.GetCurrentProperty<Vector4>(Actor::Property::WORLD_COLOR);
+  DALI_TEST_EQUALS(color, actualColor, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(color, Vector4(0.1f, 0.5f, 0.5f, 0.8f), 0.001f, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliActorPropertyBlendEquation(void)
+int UtcDaliActorCalculateWorldColor03(void)
 {
   TestApplication application;
 
-  tet_infoline("Test SetProperty AdvancedBlendEquation");
+  tet_infoline("Test that actor uses parent color");
 
-  Geometry geometry  = CreateQuadGeometry();
-  Shader   shader    = CreateShader();
-  Renderer renderer1 = Renderer::New(geometry, shader);
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
 
-  Actor actor = Actor::New();
-  actor.SetProperty(Actor::Property::OPACITY, 0.1f);
+  rootActor[Actor::Property::POSITION]    = Vector3(100.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]       = Vector3(2.0f, 2.0f, 2.0f);
+  rootActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
 
-  actor.AddRenderer(renderer1);
-  actor.SetProperty(Actor::Property::SIZE, Vector2(400, 400));
-  application.GetScene().Add(actor);
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
-  if(!Dali::Capabilities::IsBlendEquationSupported(DevelBlendEquation::SCREEN))
-  {
-    actor.SetProperty(Dali::DevelActor::Property::BLEND_EQUATION, Dali::DevelBlendEquation::SCREEN);
-    int equation = actor.GetProperty<int>(Dali::DevelActor::Property::BLEND_EQUATION);
-    DALI_TEST_EQUALS((Dali::DevelBlendEquation::SCREEN == equation), false, TEST_LOCATION);
-  }
+  rootActor[Actor::Property::COLOR]   = Color::WHITE * 0.9f;
+  branchActor[Actor::Property::COLOR] = Vector4(1.0f, 1.0f, 0.5f, 0.8f);
+  leafActor[Actor::Property::COLOR]   = Vector4(0.1f, 0.5f, 0.5f, 0.8f);
 
-  if(Dali::Capabilities::IsBlendEquationSupported(DevelBlendEquation::SCREEN))
-  {
-    actor.SetProperty(Dali::DevelActor::Property::BLEND_EQUATION, Dali::DevelBlendEquation::SCREEN);
-    int equation = actor.GetProperty<int>(Dali::DevelActor::Property::BLEND_EQUATION);
-    DALI_TEST_EQUALS((Dali::DevelBlendEquation::SCREEN == equation), true, TEST_LOCATION);
-  }
+  leafActor[Actor::Property::COLOR_MODE] = ColorMode::USE_PARENT_COLOR;
 
-  Renderer renderer2 = Renderer::New(geometry, shader);
-  actor.AddRenderer(renderer2);
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
+
+  application.SendNotification();
+  application.Render(0);
 
+  Vector4 color = DevelActor::GetWorldColor(leafActor);
+
+  Vector4 actualColor = leafActor.GetCurrentProperty<Vector4>(Actor::Property::WORLD_COLOR);
+  DALI_TEST_EQUALS(color, actualColor, 0.001f, TEST_LOCATION);
+  DALI_TEST_EQUALS(color, Vector4(1.0f, 1.0f, 0.5f, 0.72f), 0.001f, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliActorRegisterProperty(void)
+int UtcDaliActorCalculateWorldColor04(void)
 {
-  tet_infoline("Test property registration and uniform map update\n");
-
   TestApplication application;
 
-  Geometry geometry  = CreateQuadGeometry();
-  Shader   shader    = CreateShader();
-  Renderer renderer1 = Renderer::New(geometry, shader);
-  Renderer renderer2 = Renderer::New(geometry, shader);
+  tet_infoline("Test that actor blends with parent color");
 
-  Actor actor1 = Actor::New();
-  actor1.AddRenderer(renderer1);
-  actor1.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
-  actor1.RegisterProperty("uCustom", 1);
-  application.GetScene().Add(actor1);
+  Actor rootActor   = Actor::New();
+  Actor branchActor = Actor::New();
+  Actor leafActor   = Actor::New();
 
-  Actor actor2 = Actor::New();
-  actor2.AddRenderer(renderer2);
-  actor2.SetProperty(Actor::Property::SIZE, Vector2(100, 100));
-  application.GetScene().Add(actor2);
+  rootActor[Actor::Property::POSITION]    = Vector3(100.0f, 0.0f, 0.0f);
+  rootActor[Actor::Property::SCALE]       = Vector3(2.0f, 2.0f, 2.0f);
+  rootActor[Actor::Property::ORIENTATION] = AngleAxis(Degree(90.0f), Vector3::ZAXIS);
 
-  TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
-  TraceCallStack&    callStack     = glAbstraction.GetSetUniformTrace();
-  glAbstraction.EnableSetUniformCallTrace(true);
+  rootActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  branchActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  leafActor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+
+  rootActor[Actor::Property::COLOR]   = Color::WHITE * 0.9f;
+  branchActor[Actor::Property::COLOR] = Vector4(1.0f, 1.0f, 0.5f, 0.8f);
+  leafActor[Actor::Property::COLOR]   = Vector4(0.1f, 0.5f, 0.5f, 0.8f);
+
+  leafActor[Actor::Property::COLOR_MODE] = ColorMode::USE_OWN_MULTIPLY_PARENT_COLOR;
+
+  application.GetScene().Add(rootActor);
+  rootActor.Add(branchActor);
+  branchActor.Add(leafActor);
 
   application.SendNotification();
-  application.Render();
+  application.Render(0);
 
-  std::stringstream out;
-  out.str("1");
-  std::string params;
+  Vector4 color = DevelActor::GetWorldColor(leafActor);
 
-  // Test uniform value of the custom property
-  DALI_TEST_CHECK(callStack.FindMethodAndGetParameters("uCustom", params));
-  DALI_TEST_EQUALS(out.str(), params, TEST_LOCATION);
+  Vector4 actualColor = leafActor.GetCurrentProperty<Vector4>(Actor::Property::WORLD_COLOR);
+  DALI_TEST_EQUALS(color, actualColor, 0.001f, TEST_LOCATION);
 
-  // Make invisible
-  actor1[Actor::Property::VISIBLE] = false;
+  END_TEST;
+}
 
-  application.SendNotification();
-  application.Render();
+int UtcDaliActorCalculateLookAt(void)
+{
+  TestApplication application;
 
-  // Make visible again
-  actor1[Actor::Property::VISIBLE] = true;
-  actor1["uCustom"]                = 2;
+  tet_infoline("Test that actor rotate right value of orientation");
 
-  glAbstraction.ResetSetUniformCallStack();
+  Actor actor = Actor::New();
+
+  actor[Actor::Property::POSITION]      = Vector3(100.0f, 0.0f, 0.0f);
+  actor[Actor::Property::ANCHOR_POINT]  = AnchorPoint::CENTER;
+  actor[Actor::Property::PARENT_ORIGIN] = ParentOrigin::CENTER;
+
+  application.GetScene().Add(actor);
 
   application.SendNotification();
-  application.Render();
+  application.Render(0);
 
-  out.str("2");
+  Quaternion actorQuaternion;
 
-  // The uniform value should not be changed
-  DALI_TEST_CHECK(callStack.FindMethodAndGetParameters("uCustom", params));
-  DALI_TEST_EQUALS(out.str(), params, TEST_LOCATION);
+  tet_printf("Test with target only\n");
+  Dali::DevelActor::LookAt(actor, Vector3::ZERO);
+  actorQuaternion = actor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+  DALI_TEST_EQUALS(actorQuaternion, Quaternion(Radian(Degree(90.0f)), Vector3::NEGATIVE_YAXIS), TEST_LOCATION);
+
+  tet_printf("Test with target + up\n");
+  Dali::DevelActor::LookAt(actor, Vector3::ZERO, Vector3::ZAXIS);
+  actorQuaternion = actor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+  DALI_TEST_EQUALS(actorQuaternion, Quaternion(Radian(Degree(90.0f)), Vector3::XAXIS) * Quaternion(Radian(Degree(90.0f)), Vector3::NEGATIVE_YAXIS), TEST_LOCATION);
+
+  tet_printf("Test with target + up + localForward\n");
+  Dali::DevelActor::LookAt(actor, Vector3::ZERO, Vector3::NEGATIVE_YAXIS, Vector3::NEGATIVE_XAXIS);
+  actorQuaternion = actor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+  DALI_TEST_EQUALS(actorQuaternion, Quaternion(Radian(Degree(180.0f)), Vector3::XAXIS), TEST_LOCATION);
+
+  tet_printf("Test with target + up + localForward + localUp\n");
+  Dali::DevelActor::LookAt(actor, Vector3::ZERO, Vector3::NEGATIVE_YAXIS, Vector3::NEGATIVE_YAXIS, Vector3::XAXIS);
+  actorQuaternion = actor.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+  DALI_TEST_EQUALS(actorQuaternion, Quaternion(Radian(Degree(90.0f)), Vector3::NEGATIVE_ZAXIS), TEST_LOCATION);
+
+  // Reset quaternion
+  actor[Actor::Property::ORIENTATION] = Quaternion();
+
+  Actor actor2                           = Actor::New();
+  actor2[Actor::Property::POSITION]      = Vector3(0.0f, 50.0f, -10.0f);
+  actor2[Actor::Property::ANCHOR_POINT]  = AnchorPoint::CENTER;
+  actor2[Actor::Property::PARENT_ORIGIN] = ParentOrigin::CENTER;
+  actor.Add(actor2);
+
+  tet_printf("Test whether lookat calculate well by using event side values only\n");
+  Dali::DevelActor::LookAt(actor2, Vector3(100.0f, 50.0f, 1.0f));
+  actorQuaternion = actor2.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+  DALI_TEST_EQUALS(actorQuaternion, Quaternion(), TEST_LOCATION);
+
+  actor[Actor::Property::ORIENTATION] = Quaternion(Radian(Degree(90.0f)), Vector3::ZAXIS);
+
+  DALI_TEST_EQUALS(Dali::DevelActor::GetWorldTransform(actor2).GetTranslation3(), Vector3(50.0f, 0.0f, -10.0f), TEST_LOCATION);
+
+  tet_printf("Test whether lookat calculate well inherit by parent orientation\n");
+  Dali::DevelActor::LookAt(actor2, Vector3(50.0f, 0.0f, 1.0f), Vector3::NEGATIVE_XAXIS);
+  actorQuaternion = actor2.GetProperty<Quaternion>(Actor::Property::ORIENTATION);
+  DALI_TEST_EQUALS(actorQuaternion, Quaternion(), TEST_LOCATION);
 
   END_TEST;
 }